Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
29 changes: 29 additions & 0 deletions Lib/test/test_pyexpat.py
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,35 @@ def test_parent_parser_outlives_its_subparsers__chain(self):
del subparser


class ExternalEntityParserCreateErrorTest(unittest.TestCase):
"""ExternalEntityParserCreate error paths should not crash or leak
refcounts on the parent parser.

See https://github.com/python/cpython/issues/144984.
"""

def test_error_path_no_crash(self):
# When an allocation inside ExternalEntityParserCreate fails,
# the partially-initialized subparser is deallocated. This
# must not dereference NULL handlers or double-decrement the
# parent parser's refcount.
_testcapi = import_helper.import_module('_testcapi')
parser = expat.ParserCreate()
parser.buffer_text = True
rc_before = sys.getrefcount(parser)

_testcapi.set_nomemory(1, 10)
try:
parser.ExternalEntityParserCreate(None)
except MemoryError:
pass
finally:
_testcapi.remove_mem_hooks()

rc_after = sys.getrefcount(parser)
self.assertEqual(rc_after, rc_before)


class ReparseDeferralTest(unittest.TestCase):
def test_getter_setter_round_trip(self):
parser = expat.ParserCreate()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix crash in :meth:`xml.parsers.expat.xmlparser.ExternalEntityParserCreate`
when an allocation fails. The error paths could dereference NULL ``handlers``
and double-decrement the parent parser's reference count.
6 changes: 6 additions & 0 deletions Modules/pyexpat.c
Original file line number Diff line number Diff line change
Expand Up @@ -1097,12 +1097,14 @@ pyexpat_xmlparser_ExternalEntityParserCreate_impl(xmlparseobject *self,
if (self->buffer != NULL) {
new_parser->buffer = PyMem_Malloc(new_parser->buffer_size);
if (new_parser->buffer == NULL) {
new_parser->parent = NULL;
Py_DECREF(new_parser);
Py_DECREF(self);
return PyErr_NoMemory();
}
}
if (!new_parser->itself) {
new_parser->parent = NULL;
Py_DECREF(new_parser);
Py_DECREF(self);
return PyErr_NoMemory();
Expand All @@ -1117,6 +1119,7 @@ pyexpat_xmlparser_ExternalEntityParserCreate_impl(xmlparseobject *self,

new_parser->handlers = PyMem_New(PyObject *, i);
if (!new_parser->handlers) {
new_parser->parent = NULL;
Py_DECREF(new_parser);
Py_DECREF(self);
return PyErr_NoMemory();
Expand Down Expand Up @@ -2489,6 +2492,9 @@ PyInit_pyexpat(void)
static void
clear_handlers(xmlparseobject *self, int initial)
{
if (self->handlers == NULL) {
return;
}
for (size_t i = 0; handler_info[i].name != NULL; i++) {
if (initial) {
self->handlers[i] = NULL;
Expand Down
Loading