Mercurial > vim
diff src/dict.c @ 15780:5b6c3c7feba8 v8.1.0897
patch 8.1.0897: can modify a:000 when using a reference
commit https://github.com/vim/vim/commit/05c00c038bc16e862e17f9e5c8d5a72af6cf7788
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Feb 11 22:00:11 2019 +0100
patch 8.1.0897: can modify a:000 when using a reference
Problem: Can modify a:000 when using a reference.
Solution: Make check for locked variable stricter. (Ozaki Kiichi,
closes #3930)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 11 Feb 2019 22:15:07 +0100 |
| parents | 55ccc2d353bd |
| children | 0f65f2808470 |
line wrap: on
line diff
--- a/src/dict.c +++ b/src/dict.c @@ -758,8 +758,8 @@ dict_extend(dict_T *d1, dict_T *d2, char } else if (*action == 'f' && HI2DI(hi2) != di1) { - if (tv_check_lock(di1->di_tv.v_lock, arg_errmsg, TRUE) - || var_check_ro(di1->di_flags, arg_errmsg, TRUE)) + if (var_check_lock(di1->di_tv.v_lock, arg_errmsg, TRUE) + || var_check_ro(di1->di_flags, arg_errmsg, TRUE)) break; clear_tv(&di1->di_tv); copy_tv(&HI2DI(hi2)->di_tv, &di1->di_tv);