diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-04-14 14:57:22 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2023-04-14 16:10:10 +0800 |
| commit | 9c66b48316d85d24ee92d917765700713862aa2d (patch) | |
| tree | 5682b3c2396ccb6250e4305931e514d1102a8dfb /src/nvim/eval.c | |
| parent | 56cfecdd59b4a8e4fa5c23adce858371ade5620f (diff) | |
| download | rneovim-9c66b48316d85d24ee92d917765700713862aa2d.tar.gz rneovim-9c66b48316d85d24ee92d917765700713862aa2d.tar.bz2 rneovim-9c66b48316d85d24ee92d917765700713862aa2d.zip | |
vim-patch:8.2.3216: Vim9: crash when using variable in a loop at script level
Problem: Vim9: crash when using variable in a loop at script level.
Solution: Do not clear the variable if a function was defined.
Do not create a new entry in sn_var_vals every time.
(closes vim/vim#8628)
https://github.com/vim/vim/commit/2eb6fc3b52148f961e804ec2be361d531ff770d8
Omit eval_cstack: Vim9 script only.
Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index a088e6d253..ad2d854e1e 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -695,9 +695,11 @@ void eval_patch(const char *const origfile, const char *const difffile, const ch void fill_evalarg_from_eap(evalarg_T *evalarg, exarg_T *eap, bool skip) { *evalarg = (evalarg_T){ .eval_flags = skip ? 0 : EVAL_EVALUATE }; - if (eap != NULL && getline_equal(eap->getline, eap->cookie, getsourceline)) { - evalarg->eval_getline = eap->getline; - evalarg->eval_cookie = eap->cookie; + if (eap != NULL) { + if (getline_equal(eap->getline, eap->cookie, getsourceline)) { + evalarg->eval_getline = eap->getline; + evalarg->eval_cookie = eap->cookie; + } } } |