summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-02-20 23:07:05 +0100
committerBram Moolenaar <Bram@vim.org>2017-02-20 23:07:05 +0100
commit49439c4cdf7d2822255f292adda4226656fe144d (patch)
tree2007c8f88c26e6aab7ce8d2696d57eb8637ae28f
parente7877fe0de1426f8de9ada825e4f7b64810c7dbc (diff)
downloadvim-49439c4cdf7d2822255f292adda4226656fe144d.zip
patch 8.0.0344: unlet command leaks memory
Problem: Unlet command leaks memory. (Nikolai Pavlov) Solution: Free the memory on error. (closes #1497)
-rw-r--r--src/eval.c3
-rw-r--r--src/testdir/test_unlet.vim4
-rw-r--r--src/version.c2
3 files changed, 9 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c
index 3cd73b6ea..b835af8e3 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2079,7 +2079,10 @@ get_lval(
}
/* existing variable, need to check if it can be changed */
else if (var_check_ro(lp->ll_di->di_flags, name, FALSE))
+ {
+ clear_tv(&var1);
return NULL;
+ }
if (len == -1)
clear_tv(&var1);
diff --git a/src/testdir/test_unlet.vim b/src/testdir/test_unlet.vim
index 4c58785f2..c20b0beb7 100644
--- a/src/testdir/test_unlet.vim
+++ b/src/testdir/test_unlet.vim
@@ -17,3 +17,7 @@ func Test_not_existing()
unlet! does_not_exist
call assert_fails('unlet does_not_exist', 'E108:')
endfunc
+
+func Test_unlet_fails()
+ call assert_fails('unlet v:["count"]', 'E46:')
+endfunc
diff --git a/src/version.c b/src/version.c
index 5db4b111c..721485434 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 344,
+/**/
343,
/**/
342,