merge revision(s) 15924:

shyouhei · shyouhei · commit 67e558f07978 · 2008-06-15T12:59:03.000Z
* re.c (rb_reg_quote): should always copy the quoting string.
	  [ruby-core:16235]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17232 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 15 21:57:19 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_quote): should always copy the quoting string.
+	  [ruby-core:16235]
+
 Sun Jun 15 21:26:54 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/net/pop.rb (Net::POP3::do_finish): clear @n_mails and
diff --git a/re.c b/re.c
@@ -1754,7 +1754,7 @@ rb_reg_quote(str)
 	    goto meta_found;
 	}
     }
-    return str;
+    return rb_str_new3(str);
 
   meta_found:
     tmp = rb_str_new(0, RSTRING(str)->len*2);
diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 191
+#define RUBY_PATCHLEVEL 192
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

Original file line number	Diff line number	Diff line change
`@@ -1754,7 +1754,7 @@ rb_reg_quote(str)`
`1754`	`1754`	`goto meta_found;`
`1755`	`1755`	`}`
`1756`	`1756`	`}`
`1757`		`- return str;`
	`1757`	`+ return rb_str_new3(str);`
`1758`	`1758`
`1759`	`1759`	`meta_found:`
`1760`	`1760`	`tmp = rb_str_new(0, RSTRING(str)->len*2);`