From 67e558f07978c96ed7b9ca920bea771745e300e0 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 12:59:03 +0000 Subject: 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 --- ChangeLog | 5 +++++ re.c | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7ae6da8a7..35d8b31323 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 15 21:57:19 2008 Yukihiro Matsumoto + + * re.c (rb_reg_quote): should always copy the quoting string. + [ruby-core:16235] + Sun Jun 15 21:26:54 2008 Yukihiro Matsumoto * lib/net/pop.rb (Net::POP3::do_finish): clear @n_mails and diff --git a/re.c b/re.c index a405f9f57a..e2d5e9dc14 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 8136ca02bf..55d4187e01 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 -- cgit v1.2.3