diff options
| author | Zackery Spytz <zspytz@gmail.com> | 2018-10-29 01:23:59 -0600 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2018-10-29 09:23:59 +0200 |
| commit | d61f586df79a754776f448e5b23015abb71f4fd1 (patch) | |
| tree | 1fba941629a8dba2a9d2838179881bdd43df438d /Modules | |
| parent | 41c7f973b64448d850a8a2f312f9891499536c38 (diff) | |
| download | cpython-git-d61f586df79a754776f448e5b23015abb71f4fd1.tar.gz | |
[2.7] bpo-35068: Fix possible crashes in pyexpat.c. (GH-10099)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/pyexpat.c | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c index bbda6ffd02..a1a870d418 100644 --- a/Modules/pyexpat.c +++ b/Modules/pyexpat.c @@ -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; @@ -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 */ @@ -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); } @@ -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 |