mod-python: improve error logic for emb_get_servers

diff --git a/ChangeLog b/ChangeLog
index 6cf71570cc0421f02c16f0d2f637ac3997d0d5bc..4b2b76e90e77d82a6262e5f99690d6a4c9fe9808 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 /***********************************************************************
 X3 ChangeLog
 
+2009-10-06  Henrik Stuart <evilnet@hstuart.dk>
+
+       * src/mod-python.c: improve error logic for emb_get_servers.
+
 2009-10-06  Henrik Stuart <evilnet@hstuart.dk>
 
        * src/mod-python.c: improve error logic for emb_get_channels.

diff --git a/src/mod-python.c b/src/mod-python.c
index 7cdf3112c9b2bd2c44265fb059f0441532d86e39..e486b359455a936f923301d37c9d505cbe2ea1aa 100644 (file)
--- a/src/mod-python.c
+++ b/src/mod-python.c
@@ -90,8 +90,10 @@ static int _dict_iter_get_users(char const* key, UNUSED_ARG(void* data), void* e
     if ((tmp = PyString_FromString(key)) == NULL)
         return 1;
 
-    if (PyTuple_SetItem(real_extra->data, *(int*)real_extra->extra, tmp))
+    if (PyTuple_SetItem(real_extra->data, *(int*)real_extra->extra, tmp)) {
+        Py_DECREF(tmp);
         return 1;
+    }
 
     *real_extra->extra = *real_extra->extra + 1;
 
@@ -105,18 +107,27 @@ static int _dict_iter_get_channels(char const* key, UNUSED_ARG(void* data), void
     if ((tmp = PyString_FromString(key)) == NULL)
         return 1;
 
-    if (PyTuple_SetItem(real_extra->data, *(int*)real_extra->extra, tmp))
+    if (PyTuple_SetItem(real_extra->data, *(int*)real_extra->extra, tmp)) {
+        Py_DECREF(tmp);
         return 1;
+    }
 
     *real_extra->extra = *real_extra->extra + 1;
     return 0;
 }
 
 static int _dict_iter_get_servers(char const* key, UNUSED_ARG(void* data), void* extra) {
+    PyObject* tmp;
     struct _tuple_dict_extra* real_extra = (struct _tuple_dict_extra*)extra;
 
-    PyTuple_SetItem(real_extra->data, *(int*)real_extra->extra,
-            PyString_FromString(key));
+    if ((tmp = PyString_FromString(key)) == NULL)
+        return 1;
+
+    if (PyTuple_SetItem(real_extra->data, *(int*)real_extra->extra, tmp)) {
+        Py_DECREF(tmp);
+        return 1;
+    }
+
     *real_extra->extra = *real_extra->extra + 1;
     return 0;
 }
@@ -188,7 +199,8 @@ emb_get_channels(UNUSED_ARG(PyObject* self), PyObject* args) {
 static PyObject*
 emb_get_servers(UNUSED_ARG(PyObject* self), PyObject* args) {
     PyObject* retval;
-    size_t n = 0;
+    PyObject* tmp;
+    size_t n = 0, i;
     struct _tuple_dict_extra extra;
 
     if (!PyArg_ParseTuple(args, ""))
@@ -199,7 +211,15 @@ emb_get_servers(UNUSED_ARG(PyObject* self), PyObject* args) {
     extra.extra = &n;
     extra.data = retval;
 
-    dict_foreach(servers, _dict_iter_get_servers, (void*)&extra);
+    if (dict_foreach(servers, _dict_iter_get_servers, (void*)&extra) != NULL) {
+        for (i = 0; i < n; ++i) {
+            tmp = PyTuple_GetItem(retval, i);
+            PyTuple_SET_ITEM(retval, i, NULL);
+            Py_DECREF(tmp);
+        }
+        Py_DECREF(retval);
+        return NULL;
+    }
 
     return retval;
 }