Mercurial > vim
changeset 19785:99248f0ff29d v8.2.0449
patch 8.2.0449: Vim9: crash if return type is invalid
Commit: https://github.com/vim/vim/commit/cf3f8bf4ddfbc0f5ce53f0c9270dc15567f4feea
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Mar 26 13:15:42 2020 +0100
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.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 26 Mar 2020 13:30:04 +0100 |
parents | 39dbaf2eec63 |
children | ae9edaa6f0f5 |
files | src/testdir/test_vim9_script.vim src/version.c src/vim9compile.c |
diffstat | 3 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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()
--- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 449, +/**/ 448, /**/ 447,
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -1375,19 +1375,19 @@ parse_type_member(char_u **arg, type_T * emsg(_("E1007: No white space allowed before <")); else emsg(_("E1008: Missing <type>")); - 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;