* 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

1 files changed, 3 insertions, 3 deletions

diff --git a/string.c b/string.c
index a3f937d19e..d0c30c6c7b 100644
--- a/string.c
+++ b/string.c
@@ -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;
     }