summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 12:59:03 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 12:59:03 (GMT)
commit67e558f07978c96ed7b9ca920bea771745e300e0 (patch)
treedd4f1376828da8bc847ff3284d7d6554e8127fd5
parent86c4bcac89f49994ba76501820290c5fb1bdfb48 (diff)
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_5@17232 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--re.c2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c7ae6da..35d8b31 100644
--- 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
index a405f9f..e2d5e9d 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 8136ca0..55d4187 100644
--- 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