[PATCH v2 0/1] MR10590: vbscript: Reject 'Set Me' with error 1037 instead of crashing.
Add a check in the Set statement grammar rule to report error 1037 "Invalid use of 'Me' keyword" for 'Set Me = ...', matching Windows. -- v2: vbscript: Reject 'Set Me' with error 1037 instead of crashing. https://gitlab.winehq.org/wine/wine/-/merge_requests/10590
From: Francis De Brabandere <francisdb@gmail.com> Add a check in the Set statement grammar rule to report error 1037 "Invalid use of 'Me' keyword" for 'Set Me = ...', matching Windows. --- dlls/vbscript/parser.y | 3 ++- dlls/vbscript/tests/run.c | 10 ++++++++++ dlls/vbscript/vbscript.rc | 1 + dlls/vbscript/vbscript_defs.h | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index c166ba68790..556a5297927 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -238,7 +238,8 @@ SimpleStatement | tEXIT tFUNCTION { $$ = new_statement(ctx, STAT_EXITFUNC, 0, @2); CHECK_ERROR; } | tEXIT tPROPERTY { $$ = new_statement(ctx, STAT_EXITPROP, 0, @2); CHECK_ERROR; } | tEXIT tSUB { $$ = new_statement(ctx, STAT_EXITSUB, 0, @2); CHECK_ERROR; } - | tSET CallExpression '=' Expression { $$ = new_set_statement(ctx, @$, $2, $4); CHECK_ERROR; } + | tSET CallExpression '=' Expression { if($2->type == EXPR_ME) { ctx->error_loc = @3; ctx->hres = MAKE_VBSERROR(VBSE_INVALID_USE_OF_ME); YYABORT; } + $$ = new_set_statement(ctx, @$, $2, $4); CHECK_ERROR; } | tSTOP { $$ = new_statement(ctx, STAT_STOP, 0, @$); CHECK_ERROR; } | tON tERROR tRESUME tNEXT { $$ = new_onerror_statement(ctx, @$, TRUE); CHECK_ERROR; } | tON tERROR tGOTO '0' { $$ = new_onerror_statement(ctx, @$, FALSE); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index df8602523e3..7e79bfec6c0 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -3196,6 +3196,16 @@ static void test_parse_errors(void) "End Class\n", 1, 26, NULL, S_OK, 1058 + }, + { + /* Invalid use of 'Me' - Set Me inside class - error 1037 */ + L"Class C\n" + " Sub T()\n" + " Set Me = Nothing\n" + " End Sub\n" + "End Class\n", + 2, 11, + NULL, S_OK, 1037 } }; HRESULT hres; diff --git a/dlls/vbscript/vbscript.rc b/dlls/vbscript/vbscript.rc index 87005a8ab3f..f80635bd665 100644 --- a/dlls/vbscript/vbscript.rc +++ b/dlls/vbscript/vbscript.rc @@ -86,6 +86,7 @@ STRINGTABLE VBSE_INVALID_NUMBER "Invalid number" VBSE_INVALID_CHAR "Invalid character" VBSE_UNTERMINATED_STRING "Unterminated string constant" + VBSE_INVALID_USE_OF_ME "Invalid use of 'Me' keyword" VBSE_LOOP_WITHOUT_DO "'loop' without 'do'" VBSE_INVALID_EXIT "Invalid 'exit' statement" VBSE_NAME_REDEFINED "Name redefined" diff --git a/dlls/vbscript/vbscript_defs.h b/dlls/vbscript/vbscript_defs.h index 41366f699ca..9cf9cce7ad9 100644 --- a/dlls/vbscript/vbscript_defs.h +++ b/dlls/vbscript/vbscript_defs.h @@ -297,6 +297,7 @@ #define VBSE_INVALID_NUMBER 1031 #define VBSE_INVALID_CHAR 1032 #define VBSE_UNTERMINATED_STRING 1033 +#define VBSE_INVALID_USE_OF_ME 1037 #define VBSE_LOOP_WITHOUT_DO 1038 #define VBSE_INVALID_EXIT 1039 #define VBSE_NAME_REDEFINED 1041 -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10590
This merge request was approved by Jacek Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10590
participants (3)
-
Francis De Brabandere -
Francis De Brabandere (＠francisdb)
-
Jacek Caban (＠jacek)