diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-02-21 19:12:47 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-02-21 19:12:47 +0100 |
commit | 21578271bb717f7ab7b8728e9efa54c3b60ee7e4 (patch) | |
tree | bc84fb32dacad216019810d5702e13aca8d83133 | |
parent | 027c4ab4d2e3ff031b98e0fb648f5acbea180293 (diff) | |
download | vim-git-21578271bb717f7ab7b8728e9efa54c3b60ee7e4.tar.gz |
patch 8.2.2538: crash when using Python list iteratorv8.2.2538
Problem: Crash when using Python list iterator.
Solution: Increment the list reference count. (closes #7886)
-rw-r--r-- | src/if_py_both.h | 2 | ||||
-rw-r--r-- | src/testdir/test_python3.vim | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h index 2903b0ba9..9dbff1cbf 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -2815,6 +2815,7 @@ typedef struct ListIterDestruct(listiterinfo_T *lii) { list_rem_watch(lii->list, &lii->lw); + list_unref(lii->list); PyMem_Free(lii); } @@ -2850,6 +2851,7 @@ ListIter(ListObject *self) list_add_watch(l, &lii->lw); lii->lw.lw_item = l->lv_first; lii->list = l; + ++l->lv_refcount; return IterNew(lii, (destructorfun) ListIterDestruct, (nextfun) ListIterNext, diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim index 6afb76d9a..58b6427f3 100644 --- a/src/testdir/test_python3.vim +++ b/src/testdir/test_python3.vim @@ -574,6 +574,9 @@ func Test_python3_list() py3 ll[2] = 8 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 call AssertException(['py3 ll[{}] = 10'], \ 'Vim(py3):TypeError: index must be int or slice, not dict') diff --git a/src/version.c b/src/version.c index 8d29d5218..a64037d4c 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2538, +/**/ 2537, /**/ 2536, |