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.1859: Vim9: crash in unpack assignment

Browse Source 
Problem:    Vim9: crash in unpack assignment.
Solution:   Make sure an error message is turned into an exception.
            (closes #7159)
This commit is contained in:
Bram Moolenaar
2020-10-17 22:04:08 +02:00
parent 403dc31f5a
commit 352134bbfb
4 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vim9execute.c
View File

@@ -830,6 +830,8 @@ call_def_function(
int breakcheck_count = 0;
int called_emsg_before = called_emsg;
int save_suppress_errthrow = suppress_errthrow;
msglist_T **saved_msg_list = NULL;
msglist_T *private_msg_list = NULL;
// Get pointer to item in the stack.
#define STACK_TV(idx) (((typval_T *)ectx.ec_stack.ga_data) + idx)
@@ -982,6 +984,11 @@ call_def_function(
current_sctx = ufunc->uf_script_ctx;
current_sctx.sc_version = SCRIPT_VERSION_VIM9;
// Use a specific location for storing error messages to be converted to an
// exception.
saved_msg_list = msg_list;
msg_list = &private_msg_list;
// Do turn errors into exceptions.
suppress_errthrow = FALSE;
@@ -2819,6 +2826,19 @@ failed:
estack_pop();
current_sctx = save_current_sctx;
if (*msg_list != NULL && saved_msg_list != NULL)
{
msglist_T **plist = saved_msg_list;
// Append entries from the current msg_list (uncaught exceptions) to
// the saved msg_list.
while (*plist != NULL)
plist = &(*plist)->next;
*plist = *msg_list;
}
msg_list = saved_msg_list;
failed_early:
// Free all local variables, but not arguments.
for (idx = 0; idx < ectx.ec_stack.ga_len; ++idx)