Skip to content

[2.7] bpo-35068: Fix possible crashes in pyexpat.c #10099

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

Merged
serhiy-storchaka merged 1 commit into from
Oct 29, 2018
Merged

[2.7] bpo-35068: Fix possible crashes in pyexpat.c #10099

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 11 additions & 17 deletions Modules/pyexpat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,21 +1084,7 @@ xmlparse_ExternalEntityParserCreate(xmlparseobject *self, PyObject *args)
return NULL;
new_parser->buffer_size = self->buffer_size;
new_parser->buffer_used = 0;
if (self->buffer != NULL) {
new_parser->buffer = malloc(new_parser->buffer_size);
if (new_parser->buffer == NULL) {
#ifndef Py_TPFLAGS_HAVE_GC
/* Code for versions 2.0 and 2.1 */
PyObject_Del(new_parser);
#else
/* Code for versions 2.2 and later. */
PyObject_GC_Del(new_parser);
#endif
return PyErr_NoMemory();
}
}
else
new_parser->buffer = NULL;
new_parser->buffer = NULL;
new_parser->returns_unicode = self->returns_unicode;
new_parser->ordered_attributes = self->ordered_attributes;
new_parser->specified_attributes = self->specified_attributes;
Expand All @@ -1120,6 +1106,14 @@ xmlparse_ExternalEntityParserCreate(xmlparseobject *self, PyObject *args)
return PyErr_NoMemory();
}

if (self->buffer != NULL) {
new_parser->buffer = malloc(new_parser->buffer_size);
if (new_parser->buffer == NULL) {
Py_DECREF(new_parser);
return PyErr_NoMemory();
}
}

XML_SetUserData(new_parser->itself, (void *)new_parser);

/* allocate and clear handlers first */
Expand Down Expand Up @@ -1310,6 +1304,8 @@ newxmlparseobject(char *encoding, char *namespace_separator, PyObject *intern)
self->in_callback = 0;
self->ns_prefixes = 0;
self->handlers = NULL;
self->intern = intern;
Py_XINCREF(self->intern);
if (namespace_separator != NULL) {
self->itself = XML_ParserCreateNS(encoding, *namespace_separator);
}
Expand All @@ -1327,8 +1323,6 @@ newxmlparseobject(char *encoding, char *namespace_separator, PyObject *intern)
XML_SetHashSalt(self->itself,
(unsigned long)_Py_HashSecret.prefix);
#endif
self->intern = intern;
Py_XINCREF(self->intern);
#ifdef Py_TPFLAGS_HAVE_GC
PyObject_GC_Track(self);
#else
Expand Down