From ea6511c63ae463ec63c51f344ee0a2fe83e8c9d0 Mon Sep 17 00:00:00 2001
From: kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 16 Mar 2012 16:49:44 +0000
Subject: [PATCH] * string.c (trnext): fix bug with string ending with '\\'.  
 [ruby-dev:45374][Bug #6160]

* test/ruby/test_string.rb (TestString#test_delete): test for
  above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                | 8 ++++++++
 string.c                 | 4 ++--
 test/ruby/test_string.rb | 3 +++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1897bc7406..e565d23695 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Mar 17 01:46:05 2012  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* string.c (trnext): fix bug with string ending with '\\'.
+	  [ruby-dev:45374][Bug #6160]
+
+	* test/ruby/test_string.rb (TestString#test_delete): test for
+	  above.
+
 Fri Mar 16 20:06:24 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (trnext): should advance char-wise.
diff --git a/string.c b/string.c
index ae5e64db62..d06a99636e 100644
--- a/string.c
+++ b/string.c
@@ -4956,12 +4956,12 @@ trnext(struct tr *t, rb_encoding *enc)
     for (;;) {
 	if (!t->gen) {
 	    if (t->p == t->pend) return -1;
-	    if (rb_enc_ascget(t->p, t->pend, &n, enc) == '\\') {
+	    if (rb_enc_ascget(t->p, t->pend, &n, enc) == '\\' && t->p + n < t->pend) {
 		t->p += n;
 	    }
 	    t->now = rb_enc_codepoint_len(t->p, t->pend, &n, enc);
 	    t->p += n;
-	    if (rb_enc_ascget(t->p, t->pend, &n, enc) == '-') {
+	    if (rb_enc_ascget(t->p, t->pend, &n, enc) == '-' && t->p + n < t->pend) {
 		t->p += n;
 		if (t->p < t->pend) {
 		    unsigned int c = rb_enc_codepoint_len(t->p, t->pend, &n, enc);
diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb
index 17de2ece2d..622ba9ea63 100644
--- a/test/ruby/test_string.rb
+++ b/test/ruby/test_string.rb
@@ -508,6 +508,9 @@ class TestString < Test::Unit::TestCase
     assert_equal("a", "abc\u{3042 3044 3046}".delete("^a"))
     assert_equal("bc\u{3042 3044 3046}", "abc\u{3042 3044 3046}".delete("a"))
     assert_equal("\u3042", "abc\u{3042 3044 3046}".delete("^\u3042"))
+
+    bug6160 = '[ruby-dev:45374]'
+    assert_equal("", '\\'.delete('\\'), bug6160)
   end
 
   def test_delete!