thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0937: asan failure in the flatten() test

Browse Source 
Problem:    Asan failure in the flatten() test.
Solution:   Free the flattened list.
This commit is contained in:
Bram Moolenaar
2020-06-09 17:30:04 +02:00
parent a45551a535
commit dcf59c37d0
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/list.c
View File

@@ -739,6 +739,7 @@ list_insert(list_T *l, listitem_T *ni, listitem_T *item)
list_flatten(list_T *list, long maxdepth) list_flatten(list_T *list, long maxdepth)
{ {
listitem_T *item; listitem_T *item;
listitem_T *tofree;
int n; int n;
if (maxdepth == 0) if (maxdepth == 0)
@@ -760,11 +761,14 @@ list_flatten(list_T *list, long maxdepth)
vimlist_remove(list, item, item); vimlist_remove(list, item, item);
if (list_extend(list, item->li_tv.vval.v_list, next) == FAIL) if (list_extend(list, item->li_tv.vval.v_list, next) == FAIL)
return FAIL; return FAIL;
clear_tv(&item->li_tv);
tofree = item;
if (item->li_prev == NULL) if (item->li_prev == NULL)
item = list->lv_first; item = list->lv_first;
else else
item = item->li_prev->li_next; item = item->li_prev->li_next;
list_free_item(list, tofree);
if (++n >= maxdepth) if (++n >= maxdepth)
{ {

2
src/version.c
View File

@@ -754,6 +754,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 */
/**/
937,
/**/ /**/
936, 936,
/**/ /**/