summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-18 14:17:22 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-18 14:17:22 +0000
commit4c3d49e91744f62532019261429c044c63b64c44 (patch)
tree8a098f6df6c4a90d6cdb17e0aafadd67d14776f3 /string.c
parentf376d0efe243a85a8ab8566ca2922ee9029da88f (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_3@55959 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 d959b0b067..c9fa4849e5 100644
--- a/string.c
+++ b/string.c
@@ -6928,7 +6928,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);