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.
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 @@
}
/*
- * 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 @@
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 @@
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 int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1755,
+/**/
1754,
/**/
1753,
