From 577f202d25005aae5aa61c456d838e1d7bbb6bef Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sun, 5 Dec 2010 16:33:13 +0100 Subject: [PATCH] wrc: Only allow 7-bit ASCII characters in wide string constants. --- tools/wrc/parser.l | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 834c568ab9c..a1ef1cf486f 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -470,7 +470,11 @@ L\" { \\r addwchar('\r'); \\t addwchar('\t'); \\v addwchar('\v'); -\\. addwchar(yytext[1]); +\\. { + if (yytext[1] & 0x80) + parser_error("Invalid char %u in wide string", (unsigned char)yytext[1]); + addwchar(yytext[1]); + } \\\r\n addwchar(yytext[2]); line_number++; char_number = 1; \"\" addwchar('\"'); /* "bla""bla" -> "bla\"bla" */ \\\"\" addwchar('\"'); /* "bla\""bla" -> "bla\"bla" */ @@ -478,7 +482,11 @@ L\" { [^\\\n\"]+ { char *yptr = yytext; while(*yptr) /* FIXME: codepage translation */ - addwchar(*yptr++ & 0xff); + { + if (*yptr & 0x80) + parser_error("Invalid char %u in wide string", (unsigned char)*yptr); + addwchar(*yptr++ & 0xff); + } } \n parser_error("Unterminated string");