Skip to content

bpo-31758: Prevent reference leaks in __setstate__() and __init__() of _elementtree.Element #3956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

bpo-31758: Prevent reference leaks in __setstate__() and __init__() of _elementtree.Element #3956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9e6116a
init commit
orenmn Oct 11, 2017
24a251b
improve the test.
orenmn Oct 11, 2017
eede715
small fix to the test
orenmn Oct 11, 2017
505294d
yet another fix to the test
orenmn Oct 11, 2017
cb06492
run the test only if gettotalrefcount() is available.
orenmn Oct 11, 2017
d6d575e
Merge branch 'master' into bpo31758-fix-refleaks
scoder Sep 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Lib/test/test_xml_etree_c.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from test.support import import_fresh_module
import types
import unittest
import sys

cET = import_fresh_module('xml.etree.ElementTree',
fresh=['_elementtree'])
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2017-10-11-19-29-37.bpo-31758.kbeqNQ.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Prevent reference leaks in ``_elementtree.Element.__setstate__()``. Patch by
Oren Milman.
30 changes: 18 additions & 12 deletions Modules/_elementtree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,6 +1051,10 @@ element_setstate_from_attributes(ElementObject *self,
oldextra->attrib = Py_None;
}

/* Decref each of the old children. */
for (i = 0; i < self->extra->length; i++) {
Py_CLEAR(self->extra->children[i]);
}
/* Copy children */
for (i = 0; i < nchildren; i++) {
PyObject *child = PyList_GET_ITEM(children, i);
Expand Down Expand Up @@ -3660,11 +3664,11 @@ _elementtree_XMLParser___init___impl(XMLParserObject *self, PyObject *target,
const char *encoding)
/*[clinic end generated code: output=3ae45ec6cdf344e4 input=96288fcba916cfce]*/
{
self->entity = PyDict_New();
Py_XSETREF(self->entity, PyDict_New());
if (!self->entity)
return -1;

self->names = PyDict_New();
Py_XSETREF(self->names, PyDict_New());
if (!self->names) {
Py_CLEAR(self->entity);
return -1;
Expand Down Expand Up @@ -3693,41 +3697,43 @@ _elementtree_XMLParser___init___impl(XMLParserObject *self, PyObject *target,
return -1;
}
}
self->target = target;
Py_XSETREF(self->target, target);

self->handle_start_ns = PyObject_GetAttrString(target, "start_ns");
Py_XSETREF(self->handle_start_ns, PyObject_GetAttrString(target, "start_ns"));
if (ignore_attribute_error(self->handle_start_ns)) {
return -1;
}
self->handle_end_ns = PyObject_GetAttrString(target, "end_ns");
Py_XSETREF(self->handle_end_ns, PyObject_GetAttrString(target, "end_ns"));
if (ignore_attribute_error(self->handle_end_ns)) {
return -1;
}
self->handle_start = PyObject_GetAttrString(target, "start");
Py_XSETREF(self->handle_start, PyObject_GetAttrString(target, "start"));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps PyObject_GetAttrString(), Py_XSETREF() and ignore_attribute_error() can be combined in one function.

if (ignore_attribute_error(self->handle_start)) {
return -1;
}
self->handle_data = PyObject_GetAttrString(target, "data");
Py_XSETREF(self->handle_data, PyObject_GetAttrString(target, "data"));
if (ignore_attribute_error(self->handle_data)) {
return -1;
}
self->handle_end = PyObject_GetAttrString(target, "end");
Py_XSETREF(self->handle_end, PyObject_GetAttrString(target, "end"));
if (ignore_attribute_error(self->handle_end)) {
return -1;
}
self->handle_comment = PyObject_GetAttrString(target, "comment");
Py_XSETREF(self->handle_comment,
PyObject_GetAttrString(target, "comment"));
if (ignore_attribute_error(self->handle_comment)) {
return -1;
}
self->handle_pi = PyObject_GetAttrString(target, "pi");
Py_XSETREF(self->handle_pi, PyObject_GetAttrString(target, "pi"));
if (ignore_attribute_error(self->handle_pi)) {
return -1;
}
self->handle_close = PyObject_GetAttrString(target, "close");
Py_XSETREF(self->handle_close, PyObject_GetAttrString(target, "close"));
if (ignore_attribute_error(self->handle_close)) {
return -1;
}
self->handle_doctype = PyObject_GetAttrString(target, "doctype");
Py_XSETREF(self->handle_doctype,
PyObject_GetAttrString(target, "doctype"));
if (ignore_attribute_error(self->handle_doctype)) {
return -1;
}
Expand Down