diff options
author | glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-28 10:55:37 +0000 |
---|---|---|
committer | glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-28 10:55:37 +0000 |
commit | bbdd5fa7a9e7845bef3a089c901858287cea3eba (patch) | |
tree | 876e53aa47ad4a575ee503dbe93289bb5a2582da | |
parent | 20a14db9167aef810bb6b0d1669c4a69a57bd6c4 (diff) | |
download | ruby-bbdd5fa7a9e7845bef3a089c901858287cea3eba.tar.gz |
string.c: fix potential bug in String#split
* string.c (rb_str_split_m): fix potential bug when rb_memsearch()
matches a octet in the middle of a multi-byte character sequence.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | string.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -7469,7 +7469,8 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str) } else if (split_type == string) { char *ptr = RSTRING_PTR(str); - char *temp = ptr; + char *str_start = ptr; + char *substr_start = ptr; char *eptr = RSTRING_END(str); char *sptr = RSTRING_PTR(spat); long slen = RSTRING_LEN(spat); @@ -7484,11 +7485,13 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str) ptr = t; continue; } - rb_ary_push(result, rb_str_subseq(str, ptr - temp, end)); + rb_ary_push(result, rb_str_subseq(str, substr_start - str_start, + (ptr+end) - substr_start)); ptr += end + slen; + substr_start = ptr; if (!NIL_P(limit) && lim <= ++i) break; } - beg = ptr - temp; + beg = ptr - str_start; } else { char *ptr = RSTRING_PTR(str); |