mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-24 10:24:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

SF # 669553, fix memory (ref) leaks

Browse Source 
Will backport.
This commit is contained in:
Neal Norwitz 2003-01-19 15:40:09 +00:00
parent f4ca5a2f45
commit fa56e2dc40
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Modules/pyexpat.c
View File

@ -1332,24 +1332,36 @@ xmlparse_getattr(xmlparseobject *self, char *name)
}
}
#define APPEND(list, str) \
do { \
PyObject *o = PyString_FromString(str); \
if (o != NULL) \
PyList_Append(list, o); \
Py_XDECREF(o); \
} while (0)
if (strcmp(name, "__members__") == 0) {
int i;
PyObject *rc = PyList_New(0);
for (i = 0; handler_info[i].name != NULL; i++) {
PyList_Append(rc, get_handler_name(&handler_info[i]));
PyObject *o = get_handler_name(&handler_info[i]);
if (o != NULL)
PyList_Append(rc, o);
Py_XDECREF(o);
}
PyList_Append(rc, PyString_FromString("ErrorCode"));
PyList_Append(rc, PyString_FromString("ErrorLineNumber"));
PyList_Append(rc, PyString_FromString("ErrorColumnNumber"));
PyList_Append(rc, PyString_FromString("ErrorByteIndex"));
PyList_Append(rc, PyString_FromString("buffer_size"));
PyList_Append(rc, PyString_FromString("buffer_text"));
PyList_Append(rc, PyString_FromString("buffer_used"));
PyList_Append(rc, PyString_FromString("ordered_attributes"));
PyList_Append(rc, PyString_FromString("returns_unicode"));
PyList_Append(rc, PyString_FromString("specified_attributes"));
PyList_Append(rc, PyString_FromString("intern"));
APPEND(rc, "ErrorCode");
APPEND(rc, "ErrorLineNumber");
APPEND(rc, "ErrorColumnNumber");
APPEND(rc, "ErrorByteIndex");
APPEND(rc, "buffer_size");
APPEND(rc, "buffer_text");
APPEND(rc, "buffer_used");
APPEND(rc, "ordered_attributes");
APPEND(rc, "returns_unicode");
APPEND(rc, "specified_attributes");
APPEND(rc, "intern");
#undef APPEND
return rc;
}
return Py_FindMethod(xmlparse_methods, (PyObject *)self, name);

9
Objects/intobject.c
View File

@ -606,9 +606,16 @@ int_neg(PyIntObject *v)
a = v->ob_ival;
x = -a;
if (a < 0 && x < 0) {
PyObject *o;
if (err_ovf("integer negation"))
return NULL;
return PyNumber_Negative(PyLong_FromLong(a));
o = PyLong_FromLong(a);
if (o != NULL) {
PyObject *result = PyNumber_Negative(o);
Py_DECREF(o);
return result;
}
return NULL;
}
return PyInt_FromLong(x);
}