1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* re.c (unescape_escaped_nonascii): fix mbclen argument.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2007-12-02 11:45:02 +00:00
parent 040e3e7bdd
commit c650096adf
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Sun Dec 2 20:43:22 2007 Tanaka Akira <akr@fsij.org>
* re.c (unescape_escaped_nonascii): fix mbclen argument.
Sun Dec 2 15:47:57 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (parser_tokadd_mbchar): check insufficient multibyte char.

4
re.c
View File

@ -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;
}