Mercurial > vim
diff src/eval.c @ 26954:11ee2667a09a v8.2.4006
patch 8.2.4006: Vim9: crash when declaring variable on the command line
Commit: https://github.com/vim/vim/commit/c653e4a2bd4099e2fac8e1c448a0f34581d5a658
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jan 5 10:16:30 2022 +0000
patch 8.2.4006: Vim9: crash when declaring variable on the command line
Problem: Vim9: crash when declaring variable on the command line.
Solution: Use a temporary type list. (closes https://github.com/vim/vim/issues/9474)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 05 Jan 2022 11:30:04 +0100 |
| parents | b34ddbca305c |
| children | 8796f1384750 |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -889,8 +889,9 @@ get_lval( } if (*p == ':') { - scriptitem_T *si = SCRIPT_ITEM(current_sctx.sc_sid); - char_u *tp = skipwhite(p + 1); + garray_T tmp_type_list; + garray_T *type_list; + char_u *tp = skipwhite(p + 1); if (tp == p + 1 && !quiet) { @@ -898,11 +899,26 @@ get_lval( return NULL; } + if (SCRIPT_ID_VALID(current_sctx.sc_sid)) + type_list = &SCRIPT_ITEM(current_sctx.sc_sid)->sn_type_list; + else + { + type_list = &tmp_type_list; + ga_init2(type_list, sizeof(type_T), 10); + } + // parse the type after the name - lp->ll_type = parse_type(&tp, &si->sn_type_list, !quiet); + lp->ll_type = parse_type(&tp, type_list, !quiet); if (lp->ll_type == NULL && !quiet) return NULL; lp->ll_name_end = tp; + + // drop the type when not in a script + if (type_list == &tmp_type_list) + { + lp->ll_type = NULL; + clear_type_list(type_list); + } } } }