diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | re.c | 4 | ||||
| -rw-r--r-- | test/ruby/test_m17n.rb | 8 |
3 files changed, 18 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Wed Aug 26 10:52:02 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * re.c (rb_memsearch_wchar, rb_memsearch_qchar): test matching + till the end of string. [ruby-core:70592] [Bug #11488] + + * test/ruby/test_m17n.rb (test_include?, tet_index): add tests by + Tom Stuart. + Wed Aug 26 09:26:00 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * id_table.c (list_table_extend, hash_table_extend): remove C99 @@ -227,7 +227,7 @@ rb_memsearch_wchar(const unsigned char *xs, long m, const unsigned char *ys, lon const unsigned char *x = xs, x0 = *xs, *y = ys; enum {char_size = 2}; - for (n -= m; n > 0; n -= char_size, y += char_size) { + for (n -= m; n >= 0; n -= char_size, y += char_size) { if (x0 == *y && memcmp(x+1, y+1, m-1) == 0) return y - ys; } @@ -240,7 +240,7 @@ rb_memsearch_qchar(const unsigned char *xs, long m, const unsigned char *ys, lon const unsigned char *x = xs, x0 = *xs, *y = ys; enum {char_size = 4}; - for (n -= m; n > 0; n -= char_size, y += char_size) { + for (n -= m; n >= 0; n -= char_size, y += char_size) { if (x0 == *y && memcmp(x+1, y+1, m-1) == 0) return y - ys; } diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index eb2063ebea..6b89ad572d 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -1066,6 +1066,10 @@ class TestM17N < Test::Unit::TestCase assert_equal(false, e("\xa1\xa2\xa3\xa4").include?(e("\xa3"))) s = e("\xa3\xb0\xa3\xb1\xa3\xb2\xa3\xb3\xa3\xb4") assert_equal(false, s.include?(e("\xb0\xa3"))) + bug11488 = '[ruby-core:70592] [Bug #11488]' + each_encoding("abcdef", "def") do |str, substr| + assert_equal(true, str.include?(substr), bug11488) + end end def test_index @@ -1075,6 +1079,10 @@ class TestM17N < Test::Unit::TestCase assert_nil(e("\xa1\xa2\xa3\xa4").rindex(e("\xa3"))) s = e("\xa3\xb0\xa3\xb1\xa3\xb2\xa3\xb3\xa3\xb4") assert_raise(Encoding::CompatibilityError){s.rindex(a("\xb1\xa3"))} + bug11488 = '[ruby-core:70592] [Bug #11488]' + each_encoding("abcdef", "def") do |str, substr| + assert_equal(3, str.index(substr), bug11488) + end end def test_next |