[vim] 71/139: patch 7.4.1755 Problem: When using getreg() on a non-existing register a NULL list is returned. (Bjorn Linse) Solution: Allocate an empty list. Add a test.

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit 517ffbee0d5b7b46320726faaa330b61f54e867c
Author: Bram Moolenaar <Bram at vim.org>
Date:   Wed Apr 20 14:59:29 2016 +0200

    patch 7.4.1755
    Problem:    When using getreg() on a non-existing register a NULL list is
                returned. (Bjorn Linse)
    Solution:   Allocate an empty list. Add a test.
---
 src/eval.c                | 6 ++++--
 src/testdir/test_expr.vim | 9 +++++++++
 src/version.c             | 2 ++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/eval.c b/src/eval.c
index bd4a11a..28cc2f1 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -6051,7 +6051,7 @@ list_alloc(void)
 }
 
 /*
- * Allocate an empty list for a return value.
+ * Allocate an empty list for a return value, with reference count set.
  * Returns OK or FAIL.
  */
     int
@@ -13173,7 +13173,9 @@ f_getreg(typval_T *argvars, typval_T *rettv)
 	rettv->v_type = VAR_LIST;
 	rettv->vval.v_list = (list_T *)get_reg_contents(regname,
 				      (arg2 ? GREG_EXPR_SRC : 0) | GREG_LIST);
-	if (rettv->vval.v_list != NULL)
+	if (rettv->vval.v_list == NULL)
+	    rettv_list_alloc(rettv);
+	else
 	    ++rettv->vval.v_list->lv_refcount;
     }
     else
diff --git a/src/testdir/test_expr.vim b/src/testdir/test_expr.vim
index c8c8e2c..a726933 100644
--- a/src/testdir/test_expr.vim
+++ b/src/testdir/test_expr.vim
@@ -74,3 +74,12 @@ func Test_strcharpart()
 
   call assert_equal('a', strcharpart('axb', -1, 2))
 endfunc
+
+func Test_getreg_empty_list()
+  call assert_equal('', getreg('x'))
+  call assert_equal([], getreg('x', 1, 1))
+  let x = getreg('x', 1, 1)
+  let y = x
+  call add(x, 'foo')
+  call assert_equal(['foo'], y)
+endfunc
diff --git a/src/version.c b/src/version.c
index 20197c5..393b75d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1755,
+/**/
     1754,
 /**/
     1753,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git