From cf3f8bf4ddfbc0f5ce53f0c9270dc15567f4feea Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 26 Mar 2020 13:15:42 +0100 Subject: patch 8.2.0449: Vim9: crash if return type is invalid Problem: Vim9: crash if return type is invalid. (Yegappan Lakshmanan) Solution: Always return some type, not NULL. --- src/testdir/test_vim9_script.vim | 3 +++ src/version.c | 2 ++ src/vim9compile.c | 6 +++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index 9157a1d492..9b49e7cbb1 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -269,6 +269,9 @@ def Test_return_type_wrong() CheckScriptFailure(['def Func(): string', 'return 1', 'enddef'], 'expected string but got number') CheckScriptFailure(['def Func(): void', 'return "a"', 'enddef'], 'expected void but got string') CheckScriptFailure(['def Func()', 'return "a"', 'enddef'], 'expected void but got string') + + CheckScriptFailure(['def Func(): list', 'return []', 'enddef'], 'E1008:') + CheckScriptFailure(['def Func(): dict', 'return {}', 'enddef'], 'E1008:') enddef def Test_arg_type_wrong() diff --git a/src/version.c b/src/version.c index f1d2f66adc..0d7b641793 100644 --- a/src/version.c +++ b/src/version.c @@ -738,6 +738,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 449, /**/ 448, /**/ diff --git a/src/vim9compile.c b/src/vim9compile.c index a595580dbe..dd31092624 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -1375,19 +1375,19 @@ parse_type_member(char_u **arg, type_T *type, garray_T *type_list) emsg(_("E1007: No white space allowed before <")); else emsg(_("E1008: Missing ")); - return NULL; + return type; } *arg = skipwhite(*arg + 1); member_type = parse_type(arg, type_list); if (member_type == NULL) - return NULL; + return type; *arg = skipwhite(*arg); if (**arg != '>') { emsg(_("E1009: Missing > after type")); - return NULL; + return type; } ++*arg; -- cgit v1.2.3