diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-04-20 14:59:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-04-20 14:59:29 +0200 |
| commit | 517ffbee0d5b7b46320726faaa330b61f54e867c (patch) | |
| tree | 9ca3dee43fb4353bdf64586d12a55ab731be7656 /src | |
| parent | c3691332f72169c486066200c0f3935418364900 (diff) | |
| download | vim-517ffbee0d5b7b46320726faaa330b61f54e867c.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/eval.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_expr.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c index bd4a11a8a..28cc2f1a7 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 c8c8e2c2a..a72693374 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 20197c515..393b75d1d 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, |