diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-02-11 22:00:11 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-02-11 22:00:11 +0100 |
| commit | 05c00c038bc16e862e17f9e5c8d5a72af6cf7788 (patch) | |
| tree | 4c7015c7adc01116b60c8a6b19f71d7335f38b93 /src/dict.c | |
| parent | 5a6698169d10833abad88c98e5a332ddde5d110d (diff) | |
patch 8.1.0897: can modify a:000 when using a referencev8.1.0897
Problem: Can modify a:000 when using a reference.
Solution: Make check for locked variable stricter. (Ozaki Kiichi,
closes #3930)
Diffstat (limited to 'src/dict.c')
| -rw-r--r-- | src/dict.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dict.c b/src/dict.c index 91c6e55724..0bb9dfa875 100644 --- a/src/dict.c +++ b/src/dict.c @@ -758,8 +758,8 @@ dict_extend(dict_T *d1, dict_T *d2, char_u *action) } 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); |