0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

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

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

View File

@ -280,4 +280,6 @@ EXTERN char e_missing_name_after_dot[]
INIT(= N_("E1127: Missing name after dot"));
EXTERN char e_endblock_without_block[]
INIT(= N_("E1128: } without {"));
EXTERN char e_throw_with_empty_string[]
INIT(= N_("E1129: Throw with empty string"));
#endif

View File

@ -617,6 +617,21 @@ def Test_throw_vimscript()
endtry
END
CheckScriptSuccess(lines)
lines =<< trim END
vim9script
def Func()
throw @r
enddef
var result = ''
try
Func()
catch /E1129:/
result = 'caught'
endtry
assert_equal('caught', result)
END
CheckScriptSuccess(lines)
enddef
def Test_error_in_nested_function()

View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1854,
/**/
1853,
/**/

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);