IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0660: sign_cleanup() may leak memory

Browse Source 
Problem:    sign_cleanup() may leak memory.
Solution:   Free the group name before returning.  Add a few more tests.
            (Yegappan Lakshmanan)
1ea88a3e12
This commit is contained in:
Andrej Zieger 2019-05-17 12:20:22 +02:00
parent 09c236ba5c
commit 88720c626e
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/eval.c
View File

@ -15717,7 +15717,7 @@ f_sign_unplace(typval_T *argvars, typval_T *rettv)
if (argvars[1].v_type != VAR_DICT)
{
EMSG(_(e_dictreq));
return;
goto cleanup;
}
dict = argvars[1].vval.v_dict;
@ -15728,7 +15728,7 @@ f_sign_unplace(typval_T *argvars, typval_T *rettv)
{
EMSG2(_("E158: Invalid buffer name: %s"),
tv_get_string(&di->di_tv));
return;
goto cleanup;
}
}
if (tv_dict_find(dict, (char_u *)"id", -1) != NULL)
@ -15747,6 +15747,8 @@ f_sign_unplace(typval_T *argvars, typval_T *rettv)
if (sign_unplace(sign_id, group, buf, 0) == OK)
rettv->vval.v_number = 0;
}
cleanup:
xfree(group);
}

21
src/nvim/testdir/test_signs.vim
View File

@ -385,6 +385,8 @@ func Test_sign_funcs()
\ {"lnum" : -1})', 'E885:')
call assert_fails('call sign_place(22, "", "sign1", "Xsign",
\ {"lnum" : 0})', 'E885:')
call assert_fails('call sign_place(22, "", "sign1", "Xsign",
\ {"lnum" : []})', 'E745:')
call assert_equal(-1, sign_place(1, "*", "sign1", "Xsign", {"lnum" : 10}))
" Tests for sign_getplaced()
@ -420,9 +422,9 @@ func Test_sign_funcs()
\ {'id' : 20, 'buffer' : 'buffer.c'})", 'E158:')
call assert_fails("call sign_unplace('',
\ {'id' : 20, 'buffer' : ''})", 'E158:')
call assert_fails("call sign_unplace('',
call assert_fails("call sign_unplace('g1',
\ {'id' : 20, 'buffer' : 200})", 'E158:')
call assert_fails("call sign_unplace('', 'mySign')", 'E715:')
call assert_fails("call sign_unplace('g1', 'mySign')", 'E715:')
" Tests for sign_undefine()
call assert_equal(0, sign_undefine("sign1"))
@ -664,7 +666,7 @@ func Test_sign_group()
call delete("Xsign")
call sign_unplace('*')
call sign_undefine()
enew | only
enew | only
endfunc
" Place signs used for ":sign unplace" command test
@ -1013,7 +1015,7 @@ func Test_sign_unplace()
call sign_unplace('*')
call sign_undefine()
enew | only
enew | only
call delete("Xsign1")
call delete("Xsign2")
endfunc
@ -1042,6 +1044,9 @@ func Test_sign_id_autogen()
call assert_equal(1, sign_place(0, 'g1', 'sign1', 'Xsign',
\ {'lnum' : 11}))
" Check for the next generated sign id in this group
call assert_equal(2, sign_place(0, 'g1', 'sign1', 'Xsign',
\ {'lnum' : 12}))
call assert_equal(0, sign_unplace('g1', {'id' : 1}))
call assert_equal(10,
\ sign_getplaced('Xsign', {'id' : 1})[0].signs[0].lnum)
@ -1049,7 +1054,7 @@ func Test_sign_id_autogen()
call delete("Xsign")
call sign_unplace('*')
call sign_undefine()
enew | only
enew | only
endfunc
" Test for sign priority
@ -1085,6 +1090,8 @@ func Test_sign_priority()
" Error case
call assert_fails("call sign_place(1, 'g1', 'sign1', 'Xsign',
\ [])", 'E715:')
call assert_fails("call sign_place(1, 'g1', 'sign1', 'Xsign',
\ {'priority' : []})", 'E745:')
call sign_unplace('*')
" Tests for the :sign place command with priority
@ -1104,7 +1111,7 @@ func Test_sign_priority()
call sign_unplace('*')
call sign_undefine()
enew | only
enew | only
call delete("Xsign")
endfunc
@ -1146,6 +1153,6 @@ func Test_sign_memfailures()
call sign_unplace('*')
call sign_undefine()
enew | only
enew | only
call delete("Xsign")
endfunc