1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* re.c (rb_reg_quote): should always copy the quoting string.

Browse Source 
[ruby-core:16235]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-04-08 01:53:35 +00:00
parent 502e19fd10
commit 1dcbd6921e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -3,6 +3,9 @@ Tue Apr 8 10:34:10 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* load.c (rb_require_safe): should check fname path after $SAFE is * load.c (rb_require_safe): should check fname path after $SAFE is
properly set. [ruby-dev:34268] properly set. [ruby-dev:34268]
* re.c (rb_reg_quote): should always copy the quoting string.
[ruby-core:16235]
Tue Apr 8 10:30:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Apr 8 10:30:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (prelude.c): depends on enc/prelude.rb. * common.mk (prelude.c): depends on enc/prelude.rb.

6
re.c
View File

@ -2759,11 +2759,11 @@ rb_reg_quote(VALUE str)
} }
s += clen; s += clen;
} }
tmp = rb_str_new3(str);
if (ascii_only) { if (ascii_only) {
str = rb_str_new3(str); rb_enc_associate(tmp, rb_usascii_encoding());
rb_enc_associate(str, rb_usascii_encoding());
} }
return str; return tmp;
meta_found: meta_found:
tmp = rb_str_new(0, RSTRING_LEN(str)*2); tmp = rb_str_new(0, RSTRING_LEN(str)*2);