From ba20fe6289984abf051f86e4dae254dcb071c86e Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 16 Mar 2012 11:06:27 +0000 Subject: * string.c (trnext): should advance char-wise. [ruby-core:43335][Bug #6156] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index 1a0b432c0e..ae5e64db62 100644 --- a/string.c +++ b/string.c @@ -4956,13 +4956,13 @@ trnext(struct tr *t, rb_encoding *enc) for (;;) { if (!t->gen) { if (t->p == t->pend) return -1; - if (t->p < t->pend - 1 && *t->p == '\\') { - t->p++; + if (rb_enc_ascget(t->p, t->pend, &n, enc) == '\\') { + t->p += n; } t->now = rb_enc_codepoint_len(t->p, t->pend, &n, enc); t->p += n; - if (t->p < t->pend - 1 && *t->p == '-') { - t->p++; + if (rb_enc_ascget(t->p, t->pend, &n, enc) == '-') { + t->p += n; if (t->p < t->pend) { unsigned int c = rb_enc_codepoint_len(t->p, t->pend, &n, enc); t->p += n; -- cgit v1.2.3