Commit 7b6caffd authored by Fred Drake's avatar Fred Drake

Fix memory leak reported & discussed on the Python XML-SIG mailing list.

This patch was provided by Jeremy Kloth, and corresponds to pyexpat.c
1.77 in the PyXML CVS.
parent 55512dcc
...@@ -925,8 +925,10 @@ readinst(char *buf, int buf_size, PyObject *meth) ...@@ -925,8 +925,10 @@ readinst(char *buf, int buf_size, PyObject *meth)
if ((bytes = PyInt_FromLong(buf_size)) == NULL) if ((bytes = PyInt_FromLong(buf_size)) == NULL)
goto finally; goto finally;
if ((arg = PyTuple_New(1)) == NULL) if ((arg = PyTuple_New(1)) == NULL) {
Py_DECREF(bytes);
goto finally; goto finally;
}
PyTuple_SET_ITEM(arg, 0, bytes); PyTuple_SET_ITEM(arg, 0, bytes);
...@@ -946,7 +948,6 @@ readinst(char *buf, int buf_size, PyObject *meth) ...@@ -946,7 +948,6 @@ readinst(char *buf, int buf_size, PyObject *meth)
"read() returned too much data: " "read() returned too much data: "
"%i bytes requested, %i returned", "%i bytes requested, %i returned",
buf_size, len); buf_size, len);
Py_DECREF(str);
goto finally; goto finally;
} }
memcpy(buf, PyString_AsString(str), len); memcpy(buf, PyString_AsString(str), len);
...@@ -987,8 +988,10 @@ xmlparse_ParseFile(xmlparseobject *self, PyObject *args) ...@@ -987,8 +988,10 @@ xmlparse_ParseFile(xmlparseobject *self, PyObject *args)
for (;;) { for (;;) {
int bytes_read; int bytes_read;
void *buf = XML_GetBuffer(self->itself, BUF_SIZE); void *buf = XML_GetBuffer(self->itself, BUF_SIZE);
if (buf == NULL) if (buf == NULL) {
Py_DECREF(readmethod);
return PyErr_NoMemory(); return PyErr_NoMemory();
}
if (fp) { if (fp) {
bytes_read = fread(buf, sizeof(char), BUF_SIZE, fp); bytes_read = fread(buf, sizeof(char), BUF_SIZE, fp);
...@@ -999,16 +1002,21 @@ xmlparse_ParseFile(xmlparseobject *self, PyObject *args) ...@@ -999,16 +1002,21 @@ xmlparse_ParseFile(xmlparseobject *self, PyObject *args)
} }
else { else {
bytes_read = readinst(buf, BUF_SIZE, readmethod); bytes_read = readinst(buf, BUF_SIZE, readmethod);
if (bytes_read < 0) if (bytes_read < 0) {
Py_DECREF(readmethod);
return NULL; return NULL;
}
} }
rv = XML_ParseBuffer(self->itself, bytes_read, bytes_read == 0); rv = XML_ParseBuffer(self->itself, bytes_read, bytes_read == 0);
if (PyErr_Occurred()) if (PyErr_Occurred()) {
Py_XDECREF(readmethod);
return NULL; return NULL;
}
if (!rv || bytes_read == 0) if (!rv || bytes_read == 0)
break; break;
} }
Py_XDECREF(readmethod);
return get_parse_result(self, rv); return get_parse_result(self, rv);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment