# HG changeset patch # User Christian Brabandt # Date 1461157206 -7200 # Node ID 36cb3aff8c1c28ae6f02c27372fa8fb49ebca40e # Parent 4194081ee261cbb5c2b4fdd656e59ec8a7e9a470 commit https://github.com/vim/vim/commit/517ffbee0d5b7b46320726faaa330b61f54e867c Author: Bram Moolenaar 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. diff --git a/src/eval.c b/src/eval.c --- 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 *re 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 --- 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 --- 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,