diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | string.c | 12 |
2 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Wed Dec 26 07:31:14 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * string.c (rb_str_enumerate_chars): prevent shared copy from GC. + Wed Dec 26 01:31:16 2012 Keiju Ishitsuka <keiju@ishitsuka.com> * lib/irb/init.rb, lib/irb/context.rb: fix conf.debug_level= @@ -6389,6 +6389,7 @@ static VALUE rb_str_enumerate_chars(VALUE str, int wantarray) { VALUE orig = str; + VALUE substr; long i, len, n; const char *ptr; rb_encoding *enc; @@ -6421,21 +6422,24 @@ rb_str_enumerate_chars(VALUE str, int wantarray) case ENC_CODERANGE_7BIT: for (i = 0; i < len; i += n) { n = rb_enc_fast_mbclen(ptr + i, ptr + len, enc); + substr = rb_str_subseq(str, i, n); if (wantarray) - rb_ary_push(ary, rb_str_subseq(str, i, n)); + rb_ary_push(ary, substr); else - rb_yield(rb_str_subseq(str, i, n)); + rb_yield(substr); } break; default: for (i = 0; i < len; i += n) { n = rb_enc_mbclen(ptr + i, ptr + len, enc); + substr = rb_str_subseq(str, i, n); if (wantarray) - rb_ary_push(ary, rb_str_subseq(str, i, n)); + rb_ary_push(ary, substr); else - rb_yield(rb_str_subseq(str, i, n)); + rb_yield(substr); } } + RB_GC_GUARD(str); if (wantarray) return ary; else |