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.1704: Vim9: crash in for loop when autoload script has an error

Browse Source 
Problem:    Vim9: crash in for loop when autoload script has an error.
Solution:   Reset suppress_errthrow.  Check for NULL list. (closes #6967)
This commit is contained in:
Bram Moolenaar
2020-09-17 21:29:03 +02:00
parent 213da551de
commit 77e5dcc36a
3 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vim9execute.c
View File

@@ -761,6 +761,7 @@ call_def_function(
sctx_T save_current_sctx = current_sctx;
int breakcheck_count = 0;
int called_emsg_before = called_emsg;
int save_suppress_errthrow = suppress_errthrow;
// Get pointer to item in the stack.
#define STACK_TV(idx) (((typval_T *)ectx.ec_stack.ga_data) + idx)
@@ -907,6 +908,9 @@ call_def_function(
current_sctx = ufunc->uf_script_ctx;
current_sctx.sc_version = SCRIPT_VERSION_VIM9;
// Do turn errors into exceptions.
suppress_errthrow = FALSE;
// Decide where to start execution, handles optional arguments.
init_instr_idx(ufunc, argc, &ectx);
@@ -1884,7 +1888,8 @@ call_def_function(
// push the next item from the list
if (GA_GROW(&ectx.ec_stack, 1) == FAIL)
goto failed;
if (++idxtv->vval.v_number >= list->lv_len)
++idxtv->vval.v_number;
if (list == NULL || idxtv->vval.v_number >= list->lv_len)
// past the end of the list, jump to "endfor"
ectx.ec_iidx = iptr->isn_arg.forloop.for_end;
else if (list->lv_first == &range_list_item)
@@ -2713,6 +2718,9 @@ failed_early:
vim_free(ectx.ec_stack.ga_data);
vim_free(ectx.ec_trystack.ga_data);
// Not sure if this is necessary.
suppress_errthrow = save_suppress_errthrow;
if (ret != OK && called_emsg == called_emsg_before)
semsg(_(e_unknown_error_while_executing_str),
printable_func_name(ufunc));