diff options
author | glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-05 04:45:32 +0000 |
---|---|---|
committer | glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-05 04:45:32 +0000 |
commit | 3b983407ef254cf1908f844fecb4d8b3a02f9a67 (patch) | |
tree | 57a958671253db50c502369ba84a95580c2ea097 | |
parent | 3caea6b6a2e4c2e152bf8799acd21127bb88a607 (diff) | |
download | ruby-3b983407ef254cf1908f844fecb4d8b3a02f9a67.tar.gz |
* string.c (rb_str_enumerate_lines): fix invalid byte sequence error
when a separator is passed. The patch is from yoshidam (Yoshida
Masato).
[Bug #7646] [ruby-dev:46827]
* test/ruby/test_string.rb: a test for above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38704 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | string.c | 6 | ||||
-rw-r--r-- | test/ruby/test_string.rb | 5 |
3 files changed, 17 insertions, 3 deletions
@@ -1,3 +1,12 @@ +Sat Jan 5 13:38:07 2013 Masaki Matsushita <glass.saga@gmail.com> + + * string.c (rb_str_enumerate_lines): fix invalid byte sequence error + when a separator is passed. The patch is from yoshidam (Yoshida + Masato). + [Bug #7646] [ruby-dev:46827] + + * test/ruby/test_string.rb: a test for above. + Sat Jan 5 12:25:42 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * test/ruby/envutil.rb (Test::Unit::Assertions#assert_in_out_err): @@ -6199,14 +6199,14 @@ rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, int wantarray) if (c == newline && (rslen <= 1 || (pend - p >= rslen && memcmp(RSTRING_PTR(rs), p, rslen) == 0))) { - p += (rslen ? rslen : n); - line = rb_str_subseq(str, s - ptr, p - s); + const char *pp = p + (rslen ? rslen : n); + line = rb_str_subseq(str, s - ptr, pp - s); if (wantarray) rb_ary_push(ary, line); else rb_yield(line); str_mod_check(str, ptr, len); - s = p; + s = pp; } p += n; } diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index e988f99629..7b4dc2951d 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -760,6 +760,11 @@ class TestString < Test::Unit::TestCase assert_equal "hello\n", S("hello\nworld").each_line.next assert_equal "hello\nworld", S("hello\nworld").each_line(nil).next + + bug7646 = "[ruby-dev:46827]" + assert_nothing_raised(bug7646) do + "\n\u0100".each_line("\n") {} + end end def test_lines |