diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-19 12:42:19 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-19 12:42:19 +0000 |
commit | 474a88f041f936c22327bf33156eeb115c85d3d8 (patch) | |
tree | 8c279c267673efcd94b1df81c575014d6fe808d9 /string.c | |
parent | 64a912155d70a97e37c01f6e132d1ccaf5cc142f (diff) | |
download | ruby-474a88f041f936c22327bf33156eeb115c85d3d8.tar.gz |
* re.c (rb_reg_regsub): should set checked encoding.
* string.c (rb_str_sub_bang): applied r14212 too.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -2401,12 +2401,13 @@ rb_str_sub_bang(int argc, VALUE *argv, VALUE str) pat = get_pat(argv[0], 1); if (rb_reg_search(pat, str, 0, 0) >= 0) { + rb_encoding *enc; + match = rb_backref_get(); regs = RMATCH(match)->regs; if (iter) { char *p = RSTRING_PTR(str); long len = RSTRING_LEN(str); - rb_encoding *enc; rb_match_busy(match); repl = rb_obj_as_string(rb_yield(rb_reg_nth_match(0, match))); @@ -2414,13 +2415,13 @@ rb_str_sub_bang(int argc, VALUE *argv, VALUE str) str_mod_check(str, p, len); str_frozen_check(str); rb_backref_set(match); - rb_enc_associate(str, enc); } else { repl = rb_reg_regsub(repl, str, regs, pat); - rb_enc_copy(str, repl); + enc = rb_enc_check(str, repl); } rb_str_modify(str); + rb_enc_associate(str, enc); if (OBJ_TAINTED(repl)) tainted = 1; plen = END(0) - BEG(0); if (RSTRING_LEN(repl) > plen) { |