From fa42cc6c8f5c636746e0a2759715b89fd9a97341 Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 2 Dec 2007 11:45:02 +0000 Subject: * re.c (unescape_escaped_nonascii): fix mbclen argument. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ re.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index da152aca8..af63917f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Dec 2 20:43:22 2007 Tanaka Akira + + * re.c (unescape_escaped_nonascii): fix mbclen argument. + Sun Dec 2 15:47:57 2007 Nobuyoshi Nakada * parse.y (parser_tokadd_mbchar): check insufficient multibyte char. diff --git a/re.c b/re.c index 0fc5f10e3..0ecaccccf 100644 --- a/re.c +++ b/re.c @@ -1373,7 +1373,7 @@ unescape_escaped_nonascii(const char **pp, const char *end, rb_encoding *enc, } chbuf[chlen++] = byte; - while (chlen < chmaxlen && chlen != mbclen(chbuf, chbuf+chmaxlen, enc)) { + while (chlen < chmaxlen && chlen != mbclen(chbuf, chbuf+chlen, enc)) { byte = read_escaped_byte(&p, end, err); if (byte == -1) { return -1; @@ -1381,7 +1381,7 @@ unescape_escaped_nonascii(const char **pp, const char *end, rb_encoding *enc, chbuf[chlen++] = byte; } - if (chlen != mbclen(chbuf, chbuf+chmaxlen, enc)) { + if (chlen != mbclen(chbuf, chbuf+chlen, enc)) { strcpy(err, "invalid multibyte escape"); return -1; } -- cgit