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 8.2.2538: crash when using Python list iterator

Browse Source 
Problem:    Crash when using Python list iterator.
Solution:   Increment the list reference count. (closes #7886)
This commit is contained in:
Bram Moolenaar 2021-02-21 19:12:47 +01:00
parent 027c4ab4d2
commit 21578271bb
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/if_py_both.h
View File

@ -2815,6 +2815,7 @@ typedef struct
ListIterDestruct(listiterinfo_T *lii) ListIterDestruct(listiterinfo_T *lii)
{ {
list_rem_watch(lii->list, &lii->lw); list_rem_watch(lii->list, &lii->lw);
list_unref(lii->list);
PyMem_Free(lii); PyMem_Free(lii);
} }
@ -2850,6 +2851,7 @@ ListIter(ListObject *self)
list_add_watch(l, &lii->lw); list_add_watch(l, &lii->lw);
lii->lw.lw_item = l->lv_first; lii->lw.lw_item = l->lv_first;
lii->list = l; lii->list = l;
++l->lv_refcount;
return IterNew(lii, return IterNew(lii,
(destructorfun) ListIterDestruct, (nextfun) ListIterNext, (destructorfun) ListIterDestruct, (nextfun) ListIterNext,

3
src/testdir/test_python3.vim
View File

@ -574,6 +574,9 @@ func Test_python3_list()
py3 ll[2] = 8 py3 ll[2] = 8
call assert_equal([1, 2, 8], l) call assert_equal([1, 2, 8], l)
" iterating over list from Python
py3 print([x for x in vim.Function("getline")(1, 2)])
" Using dict as an index " Using dict as an index
call AssertException(['py3 ll[{}] = 10'], call AssertException(['py3 ll[{}] = 10'],
\ 'Vim(py3):TypeError: index must be int or slice, not dict') \ 'Vim(py3):TypeError: index must be int or slice, not dict')

2
src/version.c
View File

@ -750,6 +750,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 */
/**/
2538,
/**/ /**/
2537, 2537,
/**/ /**/