aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.1854: Vim9: crash when throwing exception for NULL string

Browse Source 
Problem:    Vim9: crash when throwing exception for NULL string. (Dhiraj
            Mishra)
Solution:   Handle NULL string like empty string. (closes #7139)
This commit is contained in:
Bram Moolenaar
2020-10-16 20:25:23 +02:00
parent 7a66a17190
commit 1e021e63c5
4 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vim9execute.c
View File

@@ -1381,6 +1381,8 @@ call_def_function(
tv = STACK_TV_BOT(0);
tv->v_type = VAR_STRING;
tv->v_lock = 0;
// This may result in NULL, which should be equivalent to an
// empty string.
tv->vval.v_string = get_reg_contents(
iptr->isn_arg.number, GREG_EXPR_SRC);
++ectx.ec_stack.ga_len;
@@ -2082,6 +2084,13 @@ call_def_function(
case ISN_THROW:
--ectx.ec_stack.ga_len;
tv = STACK_TV_BOT(0);
if (tv->vval.v_string == NULL
|| *skipwhite(tv->vval.v_string) == NUL)
{
emsg(_(e_throw_with_empty_string));
goto failed;
}
if (throw_exception(tv->vval.v_string, ET_USER, NULL) == FAIL)
{
vim_free(tv->vval.v_string);