aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.1755

Browse Source 
Problem:    When using getreg() on a non-existing register a NULL list is
            returned. (Bjorn Linse)
Solution:   Allocate an empty list. Add a test.
This commit is contained in:
Bram Moolenaar 2016-04-20 14:59:29 +02:00
parent c3691332f7
commit 517ffbee0d
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/eval.c
View File

@ -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. * Returns OK or FAIL.
*/ */
int int
@ -13173,7 +13173,9 @@ f_getreg(typval_T *argvars, typval_T *rettv)
rettv->v_type = VAR_LIST; rettv->v_type = VAR_LIST;
rettv->vval.v_list = (list_T *)get_reg_contents(regname, rettv->vval.v_list = (list_T *)get_reg_contents(regname,
(arg2 ? GREG_EXPR_SRC : 0) | GREG_LIST); (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; ++rettv->vval.v_list->lv_refcount;
} }
else else

9
src/testdir/test_expr.vim
View File

@ -74,3 +74,12 @@ func Test_strcharpart()
call assert_equal('a', strcharpart('axb', -1, 2)) call assert_equal('a', strcharpart('axb', -1, 2))
endfunc 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

2
src/version.c
View File

@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1755,
/**/ /**/
1754, 1754,
/**/ /**/