diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-24 07:36:55 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-24 07:36:55 +0000 |
commit | e6d4a21cb1242187cd6b06005b57ba637be2c694 (patch) | |
tree | d2563be465d6681a3b49e8366a2294a7d0a99bdf | |
parent | 3bfc1d3d201b946f04b2c4f6839a866a2392d06e (diff) |
merge revision(s) 49695: [Backport #10886]
* string.c (rb_str_split_m): raise ArgumentError at broken string
not RegexpError, as Regexp is not involved in.
[ruby-core:68229] [Bug #10886]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | string.c | 4 | ||||
-rw-r--r-- | test/ruby/test_string.rb | 18 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 27 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Tue Feb 24 16:31:53 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * string.c (rb_str_split_m): raise ArgumentError at broken string + not RegexpError, as Regexp is not involved in. + [ruby-core:68229] [Bug #10886] + Tue Feb 24 14:00:46 2015 Koichi Sasada <ko1@atdot.net> * gc.c (rb_objspace_call_finalizer): control GC execution during @@ -6384,10 +6384,11 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str) } else { fs_set: - spat = get_pat_quoted(spat, 1); + spat = get_pat_quoted(spat, 0); if (BUILTIN_TYPE(spat) == T_STRING) { rb_encoding *enc2 = STR_ENC_GET(spat); + mustnot_broken(spat); split_type = string; if (RSTRING_LEN(spat) == 0) { /* Special case - split into chars */ @@ -6482,7 +6483,6 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str) long slen = RSTRING_LEN(spat); mustnot_broken(str); - mustnot_broken(spat); enc = rb_enc_check(str, spat); while (ptr < eptr && (end = rb_memsearch(sptr, slen, ptr, eptr - ptr, enc)) >= 0) { diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index bb24f508d3..4cd6afdd80 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -1345,14 +1345,18 @@ class TestString < Test::Unit::TestCase assert_equal([], "".split(//, 1)) assert_equal("[2, 3]", [1,2,3].slice!(1,10000).inspect, "moved from btest/knownbug") + end + def test_split_encoding bug6206 = '[ruby-dev:45441]' Encoding.list.each do |enc| next unless enc.ascii_compatible? s = S("a:".force_encoding(enc)) assert_equal([enc]*2, s.split(":", 2).map(&:encoding), bug6206) end + end + def test_split_wchar bug8642 = '[ruby-core:56036] [Bug #8642]' [ Encoding::UTF_16BE, Encoding::UTF_16LE, @@ -1365,6 +1369,20 @@ class TestString < Test::Unit::TestCase end end + def test_split_invalid_sequence + bug10886 = '[ruby-core:68229] [Bug #10886]' + broken = S("\xa1".force_encoding("utf-8")) + assert_raise(ArgumentError, bug10886) { + S("a,b").split(broken) + } + end + + def test_split_invalid_argument + assert_raise(TypeError) { + S("a,b").split(BasicObject.new) + } + end + def test_squeeze assert_equal(S("abc"), S("aaabbbbccc").squeeze) assert_equal(S("aa bb cc"), S("aa bb cc").squeeze(S(" "))) @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.0" #define RUBY_RELEASE_DATE "2015-02-24" -#define RUBY_PATCHLEVEL 79 +#define RUBY_PATCHLEVEL 80 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 2 |