diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-23 15:59:09 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-23 15:59:09 +0000 |
commit | 0fd3bdac6a837f06edbea22f9a72eaea5d4053db (patch) | |
tree | 7c9bec32375e80e3a18b0a35ca8aaa91d0ccb47a /string.c | |
parent | 34cf45ab19f0d4ec3f42ec414173aeb5fe0164b0 (diff) | |
download | ruby-0fd3bdac6a837f06edbea22f9a72eaea5d4053db.tar.gz |
* string.c (rb_str_each_char): return original string.
[ruby-core:23499]
* string.c (rb_str_each_codepoint): protect string from
modification.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -5925,6 +5925,7 @@ rb_str_each_byte(VALUE str) static VALUE rb_str_each_char(VALUE str) { + VALUE orig = str; int i, len, n; const char *ptr; rb_encoding *enc; @@ -5948,7 +5949,7 @@ rb_str_each_char(VALUE str) rb_yield(rb_str_subseq(str, i, n)); } } - return str; + return orig; } /* @@ -5984,6 +5985,7 @@ rb_str_each_char(VALUE str) static VALUE rb_str_each_codepoint(VALUE str) { + VALUE orig = str; int len, n; unsigned int c; const char *ptr, *end; @@ -5991,6 +5993,7 @@ rb_str_each_codepoint(VALUE str) if (single_byte_optimizable(str)) return rb_str_each_byte(str); RETURN_ENUMERATOR(str, 0, 0); + str = rb_str_new4(str); ptr = RSTRING_PTR(str); len = RSTRING_LEN(str); end = RSTRING_END(str); @@ -6000,7 +6003,7 @@ rb_str_each_codepoint(VALUE str) rb_yield(UINT2NUM(c)); ptr += n; } - return str; + return orig; } static long |