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

fix r65954; Keep tainty

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65956 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2018-11-24 12:26:07 +00:00
parent 7599b3f6c6
commit 1f9731654e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
string.c
View File

@ -8485,7 +8485,7 @@ rb_str_enumerate_grapheme_clusters(VALUE str, VALUE ary)
VALUE orig = str; VALUE orig = str;
regex_t *reg_grapheme_cluster = NULL; regex_t *reg_grapheme_cluster = NULL;
rb_encoding *enc = rb_enc_from_index(ENCODING_GET(str)); rb_encoding *enc = rb_enc_from_index(ENCODING_GET(str));
const char *ptr, *end; const char *ptr0, *ptr, *end;
if (!rb_enc_unicode_p(enc)) { if (!rb_enc_unicode_p(enc)) {
return rb_str_enumerate_chars(str, ary); return rb_str_enumerate_chars(str, ary);
@ -8493,7 +8493,7 @@ rb_str_enumerate_grapheme_clusters(VALUE str, VALUE ary)
if (!ary) str = rb_str_new_frozen(str); if (!ary) str = rb_str_new_frozen(str);
reg_grapheme_cluster = get_reg_grapheme_cluster(enc); reg_grapheme_cluster = get_reg_grapheme_cluster(enc);
ptr = RSTRING_PTR(str); ptr0 = ptr = RSTRING_PTR(str);
end = RSTRING_END(str); end = RSTRING_END(str);
while (ptr < end) { while (ptr < end) {
@ -8501,7 +8501,7 @@ rb_str_enumerate_grapheme_clusters(VALUE str, VALUE ary)
(const OnigUChar *)ptr, (const OnigUChar *)end, (const OnigUChar *)ptr, (const OnigUChar *)end,
(const OnigUChar *)ptr, NULL, 0); (const OnigUChar *)ptr, NULL, 0);
if (len <= 0) break; if (len <= 0) break;
ENUM_ELEM(ary, rb_enc_str_new(ptr, len, enc)); ENUM_ELEM(ary, rb_str_subseq(str, ptr-ptr0, len));
ptr += len; ptr += len;
} }
RB_GC_GUARD(str); RB_GC_GUARD(str);