merge revision(s) 15924:

	* 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_6@17234 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 2fe5f54b56..93bf1143d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 15 21:59:22 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:27:46 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
index 446ea4fa24..0a9f8f7c8e 100644
--- 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
index bb03fe1d5a..6573128efd 100644
--- a/version.h
+++ b/version.h
@@ -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