]> granicus.if.org Git - python/commitdiff
#1782: don't leak in error case in PyModule_AddXxxConstant. Patch by Hrvoje Nikšić.
authorGeorg Brandl <georg@python.org>
Sat, 19 Jan 2008 18:02:46 +0000 (18:02 +0000)
committerGeorg Brandl <georg@python.org>
Sat, 19 Jan 2008 18:02:46 +0000 (18:02 +0000)
Python/modsupport.c

index 1aa3df2852c2226d084a6acb8cc4c47b281f5afc..d54158f212290e52e9bc31ba6d907b73cf9a3492 100644 (file)
@@ -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;
 }