diff options
| author | Georg Brandl <georg@python.org> | 2008-01-19 18:02:46 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-01-19 18:02:46 (GMT) |
| commit | c211a0a00b286188b8a4182e924511bdcbb85cda (patch) | |
| tree | 1588323cb1781304b9a1138570dc9fadf2703ed6 /Python | |
| parent | 6ebc52749cd06623f6b813f41987803887fbb929 (diff) | |
| download | cpython-c211a0a00b286188b8a4182e924511bdcbb85cda.zip cpython-c211a0a00b286188b8a4182e924511bdcbb85cda.tar.gz cpython-c211a0a00b286188b8a4182e924511bdcbb85cda.tar.bz2 | |
#1782: don't leak in error case in PyModule_AddXxxConstant. Patch by Hrvoje Nikšić.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/modsupport.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Python/modsupport.c b/Python/modsupport.c index 1aa3df2..d54158f 100644 --- a/Python/modsupport.c +++ b/Python/modsupport.c @@ -621,11 +621,23 @@ PyModule_AddObject(PyObject *m, const char *name, PyObject *o) int PyModule_AddIntConstant(PyObject *m, const char *name, long value) { - return PyModule_AddObject(m, name, PyInt_FromLong(value)); + PyObject *o = PyInt_FromLong(value); + if (!o) + return -1; + if (PyModule_AddObject(m, name, o) == 0) + return 0; + Py_DECREF(o); + return -1; } int PyModule_AddStringConstant(PyObject *m, const char *name, const char *value) { - return PyModule_AddObject(m, name, PyString_FromString(value)); + PyObject *o = PyString_FromString(value); + if (!o) + return -1; + if (PyModule_AddObject(m, name, o) == 0) + return 0; + Py_DECREF(o); + return -1; } |