aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.1538: Python: iteration over vim objects fails to keep reference

Browse Source 
Problem:    Python: iteration over vim objects fails to keep reference.
Solution:   Keep a reference for the object. (Paul Ollis, closes #6803,
            closes #6806)
This commit is contained in:
Bram Moolenaar
2020-08-29 12:57:16 +02:00
parent b06a6d59d1
commit 423a85a11a
3 changed files with 68 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/if_py_both.h
View File

@@ -1442,11 +1442,12 @@ typedef struct
destructorfun destruct;
traversefun traverse;
clearfun clear;
PyObject *iter_object;
} IterObject;
static PyObject *
IterNew(void *start, destructorfun destruct, nextfun next, traversefun traverse,
clearfun clear)
clearfun clear, PyObject *iter_object)
{
IterObject *self;
@@ -1456,6 +1457,10 @@ IterNew(void *start, destructorfun destruct, nextfun next, traversefun traverse,
self->destruct = destruct;
self->traverse = traverse;
self->clear = clear;
self->iter_object = iter_object;
if (iter_object)
Py_INCREF(iter_object);
return (PyObject *)(self);
}
@@ -1463,6 +1468,8 @@ IterNew(void *start, destructorfun destruct, nextfun next, traversefun traverse,
static void
IterDestructor(IterObject *self)
{
if (self->iter_object)
Py_DECREF(self->iter_object);
PyObject_GC_UnTrack((void *)(self));
self->destruct(self->cur);
PyObject_GC_Del((void *)(self));
@@ -1844,7 +1851,7 @@ DictionaryIter(DictionaryObject *self)
return IterNew(dii,
(destructorfun) PyMem_Free, (nextfun) DictionaryIterNext,
NULL, NULL);
NULL, NULL, (PyObject *)self);
}
static PyInt
@@ -2842,7 +2849,7 @@ ListIter(ListObject *self)
return IterNew(lii,
(destructorfun) ListIterDestruct, (nextfun) ListIterNext,
NULL, NULL);
NULL, NULL, (PyObject *)self);
}
static char *ListAttrs[] = {
@@ -3491,7 +3498,7 @@ OptionsIter(OptionsObject *self)
return IterNew(oii,
(destructorfun) PyMem_Free, (nextfun) OptionsIterNext,
NULL, NULL);
NULL, NULL, (PyObject *)self);
}
static int
@@ -5488,14 +5495,15 @@ BufMapIterNext(PyObject **buffer)
}
static PyObject *
BufMapIter(PyObject *self UNUSED)
BufMapIter(PyObject *self)
{
PyObject *buffer;
buffer = BufferNew(firstbuf);
return IterNew(buffer,
(destructorfun) BufMapIterDestruct, (nextfun) BufMapIterNext,
(traversefun) BufMapIterTraverse, (clearfun) BufMapIterClear);
(traversefun) BufMapIterTraverse, (clearfun) BufMapIterClear,
(PyObject *)self);
}
static PyMappingMethods BufMapAsMapping = {