mirror of
https://github.com/vim/vim.git
synced 2025-10-06 05:44:14 -04:00
patch 8.2.3182: Vim9: crash when using removing items from a constant list
Problem: Vim9: crash when using removing items from a constant list. (Yegappan Lakshmanan) Solution: When a list was allocated with items copy them.
This commit is contained in:
28
src/list.c
28
src/list.c
@@ -1566,12 +1566,32 @@ list_remove(typval_T *argvars, typval_T *rettv, char_u *arg_errmsg)
|
|||||||
vimlist_remove(l, item, item2);
|
vimlist_remove(l, item, item2);
|
||||||
if (rettv_list_alloc(rettv) == OK)
|
if (rettv_list_alloc(rettv) == OK)
|
||||||
{
|
{
|
||||||
l = rettv->vval.v_list;
|
list_T *rl = rettv->vval.v_list;
|
||||||
l->lv_first = item;
|
|
||||||
l->lv_u.mat.lv_last = item2;
|
if (l->lv_with_items > 0)
|
||||||
|
{
|
||||||
|
// need to copy the list items and move the value
|
||||||
|
while (item != NULL)
|
||||||
|
{
|
||||||
|
li = listitem_alloc();
|
||||||
|
if (li == NULL)
|
||||||
|
return;
|
||||||
|
li->li_tv = item->li_tv;
|
||||||
|
init_tv(&item->li_tv);
|
||||||
|
list_append(rl, li);
|
||||||
|
if (item == item2)
|
||||||
|
break;
|
||||||
|
item = item->li_next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
rl->lv_first = item;
|
||||||
|
rl->lv_u.mat.lv_last = item2;
|
||||||
item->li_prev = NULL;
|
item->li_prev = NULL;
|
||||||
item2->li_next = NULL;
|
item2->li_next = NULL;
|
||||||
l->lv_len = cnt;
|
rl->lv_len = cnt;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -2083,6 +2083,12 @@ def Test_remote_startserver()
|
|||||||
CheckDefFailure(['remote_startserver({})'], 'E1013: Argument 1: type mismatch, expected string but got dict<unknown>')
|
CheckDefFailure(['remote_startserver({})'], 'E1013: Argument 1: type mismatch, expected string but got dict<unknown>')
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
|
def Test_remove_const_list()
|
||||||
|
var l: list<number> = [1, 2, 3, 4]
|
||||||
|
assert_equal([1, 2], remove(l, 0, 1))
|
||||||
|
assert_equal([3, 4], l)
|
||||||
|
enddef
|
||||||
|
|
||||||
def Test_remove_return_type()
|
def Test_remove_return_type()
|
||||||
var l = remove({one: [1, 2], two: [3, 4]}, 'one')
|
var l = remove({one: [1, 2], two: [3, 4]}, 'one')
|
||||||
var res = 0
|
var res = 0
|
||||||
|
@@ -755,6 +755,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 */
|
||||||
|
/**/
|
||||||
|
3182,
|
||||||
/**/
|
/**/
|
||||||
3181,
|
3181,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user