[前][次][番号順一覧][スレッド一覧]

ruby-changes:4853

From: ko1@a...
Date: Sat, 10 May 2008 22:15:28 +0900 (JST)
Subject: [ruby-changes:4853] matz - Ruby:r16347 (trunk): * string.c (tr_trans): single '^' does not mean negation.

matz	2008-05-10 22:15:13 +0900 (Sat, 10 May 2008)

  New Revision: 16347

  Modified files:
    trunk/ChangeLog
    trunk/string.c

  Log:
    * string.c (tr_trans): single '^' does not mean negation.
      [ruby-dev:34632]

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/string.c?r1=16347&r2=16346&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16347&r2=16346&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16346)
+++ ChangeLog	(revision 16347)
@@ -1,3 +1,8 @@
+Sat May 10 22:14:03 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* string.c (tr_trans): single '^' does not mean negation.
+	  [ruby-dev:34632]
+
 Sat May 10 18:11:18 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* string.c (rb_str_each_line): zero length record separator should
Index: string.c
===================================================================
--- string.c	(revision 16346)
+++ string.c	(revision 16347)
@@ -4243,7 +4243,9 @@
 	enc = rb_enc_check(src, repl);
     }
     trsrc.p = RSTRING_PTR(src); trsrc.pend = trsrc.p + RSTRING_LEN(src);
-    if (RSTRING_LEN(str) > 1 && rb_enc_ascget(trsrc.p, trsrc.pend, &l, enc) == '^') {
+    if (RSTRING_LEN(str) > 1 &&
+	rb_enc_ascget(trsrc.p, trsrc.pend, &l, enc) == '^' &&
+	trsrc.p + l < trsrc.pend) {
 	cflag = 1;
 	trsrc.p += l;
     }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]