Issue #6676: merge from 3.4

This commit is contained in:
Ned Deily 2014-03-27 16:44:06 -07:00
commit 090eb1fd18
4 changed files with 26 additions and 2 deletions

View file

@ -908,7 +908,7 @@ xmlparse_ParseFile(xmlparseobject *self, PyObject *f)
void *buf = XML_GetBuffer(self->itself, BUF_SIZE);
if (buf == NULL) {
Py_XDECREF(readmethod);
return PyErr_NoMemory();
return get_parse_result(self, 0);
}
bytes_read = readinst(buf, BUF_SIZE, readmethod);