vbscript: Remove overzealous check in parse_hex_literal.

is_identifier_char also triggers on logical operators like "or". Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50179Signed-off-by: Robert Wilhelm <robert.wilhelm@gmx.net> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

vbscript: Remove overzealous check in parse_hex_literal.
9821da55 · Robert Wilhelm · Alexandre Julliard · 9591dec3 · 9821da55 · 9821da55
Commit 9821da55 authored Nov 27, 2020 by Robert Wilhelm Committed by Alexandre Julliard Nov 27, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

lex.c dlls/vbscript/lex.c +1 -1

lang.vbs dlls/vbscript/tests/lang.vbs +1 -0

No files found.
--- a/dlls/vbscript/lex.c
+++ b/dlls/vbscript/lex.c
@@ -315,7 +315,7 @@ static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret)
    while((d = hex_to_int(*++ctx->ptr)) != -1)
        l = l*16 + d;

-    if(begin + 9 /* max digits+1 */ < ctx->ptr || (*ctx->ptr != '&' && is_identifier_char(*ctx->ptr))) {
+    if(begin + 9 /* max digits+1 */ < ctx->ptr) {
        FIXME("invalid literal\n");
        return 0;
    }

--- a/dlls/vbscript/tests/lang.vbs
+++ b/dlls/vbscript/tests/lang.vbs
@@ -60,6 +60,7 @@ Call ok(&hfffe = -2, "&hfffe <> -2")
 Call ok(&hffff& = 65535, "&hffff& <> -1")
 Call ok(&hfffe& = 65534, "&hfffe& <> -2")
 Call ok(&hffffffff& = -1, "&hffffffff& <> -1")
+Call ok((&h01or&h02)=3,"&h01or&h02 <> 3")

 W = 5
 Call ok(W = 5, "W = " & W & " expected " & 5)