[PATCH 0/1] MR10579: Draft: vbscript: Identifier improvements

[Francis De Brabandere (＠francisdb)]

Windows limits VBScript identifiers to 255 characters, returning
error 1030 (Identifier too long) for longer names. Wine previously
accepted identifiers of any length.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10579

[PATCH 1/1] vbscript: Reject identifiers longer than 255 characters.

[Francis De Brabandere]

From: Francis De Brabandere <[e-mail]>

Windows limits VBScript identifiers to 255 characters, returning
error 1030 (Identifier too long) for longer names. Wine previously
accepted identifiers of any length.
---
 dlls/vbscript/lex.c           | 3 +++
 dlls/vbscript/tests/lang.vbs  | 5 +++++
 dlls/vbscript/tests/run.c     | 6 ++++++
 dlls/vbscript/vbscript_defs.h | 1 +
 4 files changed, 15 insertions(+)

diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c
index 1f9c4c3b18c..9d478412c8a 100644
--- a/dlls/vbscript/lex.c
+++ b/dlls/vbscript/lex.c
@@ -159,6 +159,9 @@ static int parse_identifier(parser_ctx_t *ctx, const WCHAR **ret)
         ctx->ptr++;
     len = ctx->ptr-ptr;
 
+    if(len > 255)
+        return lex_error(ctx, MAKE_VBSERROR(VBSE_IDENTIFIER_TOO_LONG));
+
     str = parser_alloc(ctx, (len+1)*sizeof(WCHAR));
     if(!str)
         return 0;
diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs
index ed483602176..36db21afad8 100644
--- a/dlls/vbscript/tests/lang.vbs
+++ b/dlls/vbscript/tests/lang.vbs
@@ -273,6 +273,11 @@ x _
 
 x = 3
 
+' Maximum identifier length (255 chars)
+Dim aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = 42
+Call ok(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = 42, "255-char identifier should work")
+
 Class ChainedCallTarget
     Public Function Ret()
         Set Ret = Me
diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c
index da6f31ff4df..aded525c0ff 100644
--- a/dlls/vbscript/tests/run.c
+++ b/dlls/vbscript/tests/run.c
@@ -3049,6 +3049,12 @@ static void test_parse_errors(void)
             L"x = 1 _x\n",
             0, 7,
             NULL, S_OK, 1032
+        },
+        {
+            /* Identifier too long (256 chars) */
+            L"Dim aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n",
+            0, -261,
+            NULL, S_OK, 1030
         }
     };
     HRESULT hres;
diff --git a/dlls/vbscript/vbscript_defs.h b/dlls/vbscript/vbscript_defs.h
index 4654798b8a1..6e647918e34 100644
--- a/dlls/vbscript/vbscript_defs.h
+++ b/dlls/vbscript/vbscript_defs.h
@@ -287,6 +287,7 @@
 #define VBSE_EXPECTED_END_OF_STATEMENT   1025
 #define VBSE_EXPECTED_INTEGER_CONSTANT   1026
 #define VBSE_EXPECTED_WHILE_UNTIL_EOS    1028
+#define VBSE_IDENTIFIER_TOO_LONG         1030
 #define VBSE_INVALID_NUMBER              1031
 #define VBSE_INVALID_CHAR                1032
 #define VBSE_UNTERMINATED_STRING         1033
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10579