Skip to content

Commit

Permalink
patch 8.1.1611: bufadd() reuses existing buffer without a name
Browse files Browse the repository at this point in the history
Problem:    Bufadd() reuses existing buffer without a name.
Solution:   When the name is empty always create a new buffer.
  • Loading branch information
brammool committed Jun 30, 2019
1 parent 15e248e commit 892ae72
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/evalfunc.c
Expand Up @@ -1929,7 +1929,9 @@ find_buffer(typval_T *avar)
static void
f_bufadd(typval_T *argvars, typval_T *rettv)
{
rettv->vval.v_number = buflist_add(tv_get_string(&argvars[0]), 0);
char_u *name = tv_get_string(&argvars[0]);

rettv->vval.v_number = buflist_add(*name == NUL ? NULL : name, 0);
}

/*
Expand Down
14 changes: 14 additions & 0 deletions src/testdir/test_functions.vim
Expand Up @@ -1539,6 +1539,20 @@ func Test_bufadd_bufload()
call assert_equal(['some', 'text'], getbufline(buf, 1, '$'))
call assert_equal(curbuf, bufnr(''))

let buf1 = bufadd('')
let buf2 = bufadd('')
call assert_notequal(0, buf1)
call assert_notequal(0, buf2)
call assert_notequal(buf1, buf2)
call assert_equal(1, bufexists(buf1))
call assert_equal(1, bufexists(buf2))
call assert_equal(0, bufloaded(buf1))
exe 'bwipe ' .. buf1
call assert_equal(0, bufexists(buf1))
call assert_equal(1, bufexists(buf2))
exe 'bwipe ' .. buf2
call assert_equal(0, bufexists(buf2))

bwipe someName
bwipe otherName
call assert_equal(0, bufexists('someName'))
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -777,6 +777,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1611,
/**/
1610,
/**/
Expand Down

0 comments on commit 892ae72

Please sign in to comment.