summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-16 04:56:04 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-16 04:56:04 +0000
commiteee441fdfe9941d13aff0333effd0c6f6ced346f (patch)
tree3a6db25e7e76358463f3762830d17f2ca1f1c6ea /string.c
parentbe4b713d53381cbaec2a9b3aeef0113eeacc172b (diff)
merge revision(s) 55729: [Backport #12611]
* vm.c (vm_set_main_stack): remove unnecessary check. toplevel binding must be initialized. [Bug #12611] (N1) * win32/win32.c (w32_symlink): fix return type. [Bug #12611] (N3) * string.c (rb_str_split_m): simplify the condition. [Bug #12611](N4) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/string.c b/string.c
index 1f2ae5f044..9115ad1bde 100644
--- a/string.c
+++ b/string.c
@@ -6523,7 +6523,7 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str)
beg = start;
}
else {
- if (ptr+start == ptr+len)
+ if (start == len)
start++;
else
start += rb_enc_fast_mbclen(ptr+start,ptr+len,enc);