From 26eb8e4b4e39aee7c1e4e9c061c9c17daaafc78b Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 17 Aug 2015 08:58:50 +0000 Subject: merge revision(s) 51470: [Backport #11413] * re.c (rb_memsearch): should match only char boundaries in wide character encodings. [ruby-core:70220] [Bug #11413] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index 0a4a789f00..859018e5c1 100644 --- a/string.c +++ b/string.c @@ -6213,15 +6213,10 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str) } enc = STR_ENC_GET(str); - if (NIL_P(spat)) { - if (!NIL_P(rb_fs)) { - spat = rb_fs; - goto fs_set; - } + if (NIL_P(spat) && NIL_P(spat = rb_fs)) { split_type = awk; } else { - fs_set: if (RB_TYPE_P(spat, T_STRING)) { rb_encoding *enc2 = STR_ENC_GET(spat); -- cgit v1.2.3