shyouhei	2008-06-15 22:03:03 +0900 (Sun, 15 Jun 2008)

  New Revision: 17234

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/re.c
    branches/ruby_1_8_6/version.h

  Log:
    merge revision(s) 15924:
    * re.c (rb_reg_quote): should always copy the quoting string.
      [ruby-core:16235]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=17234&r2=17233&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17234&r2=17233&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/re.c?r1=17234&r2=17233&diff_format=u

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 17233)
+++ ruby_1_8_6/ChangeLog	(revision 17234)
@@ -1,3 +1,8 @@
+Sun Jun 15 21:59:22 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* re.c (rb_reg_quote): should always copy the quoting string.
+	  [ruby-core:16235]
+
 Sun Jun 15 21:27:46 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/net/pop.rb (Net::POP3::do_finish): clear @n_mails and
Index: ruby_1_8_6/re.c
===================================================================
--- ruby_1_8_6/re.c	(revision 17233)
+++ ruby_1_8_6/re.c	(revision 17234)
@@ -1754,7 +1754,7 @@
 	    goto meta_found;
 	}
     }
-    return str;
+    return rb_str_new3(str);
 
   meta_found:
     tmp = rb_str_new(0, RSTRING(str)->len*2);
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 17233)
+++ ruby_1_8_6/version.h	(revision 17234)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 192
+#define RUBY_PATCHLEVEL 193
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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