From ea6511c63ae463ec63c51f344ee0a2fe83e8c9d0 Mon Sep 17 00:00:00 2001 From: kazu Date: Fri, 16 Mar 2012 16:49:44 +0000 Subject: * 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 --- string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'string.c') 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); -- cgit v1.2.3