python plugin: Check return value of malloc().

[collectd.git] / src / python.c

diff --git a/src/python.c b/src/python.c
index 10ac8f0..10d283d 100644 (file)
--- a/src/python.c
+++ b/src/python.c
@@ -289,7 +289,7 @@ void cpy_log_exception(const char *context) {
                Py_XDECREF(traceback);
                return;
        }
-       list = PyObject_CallFunction(cpy_format_exception, "NNN", type, value, traceback); /* New reference. */
+       list = PyObject_CallFunction(cpy_format_exception, "NNN", type, value, traceback); /* New reference. Steals references from "type", "value" and "traceback". */
        if (list)
                l = PyObject_Length(list);
        for (i = 0; i < l; ++i) {
@@ -309,9 +309,6 @@ void cpy_log_exception(const char *context) {
        }
        Py_XDECREF(list);
        PyErr_Clear();
-       Py_DECREF(type);
-       Py_XDECREF(value);
-       Py_XDECREF(traceback);
 }
 
 static int cpy_read_callback(user_data_t *data) {
@@ -537,7 +534,12 @@ static PyObject *cpy_register_generic(cpy_callback_t **list_head, PyObject *args
 
        Py_INCREF(callback);
        Py_XINCREF(data);
+
        c = malloc(sizeof(*c));
+       if (c == NULL)
+               return NULL;
+       memset (c, 0, sizeof (*c));
+
        c->name = strdup(buf);
        c->callback = callback;
        c->data = data;
@@ -576,7 +578,7 @@ static PyObject *cpy_register_generic_userdata(void *reg, void *handler, PyObjec
        char buf[512];
        reg_function_t *register_function = (reg_function_t *) reg;
        cpy_callback_t *c = NULL;
-       user_data_t *user_data = NULL;
+       user_data_t user_data;
        char *name = NULL;
        PyObject *callback = NULL, *data = NULL;
        static char *kwlist[] = {"callback", "data", "name", NULL};
@@ -592,22 +594,29 @@ static PyObject *cpy_register_generic_userdata(void *reg, void *handler, PyObjec
        
        Py_INCREF(callback);
        Py_XINCREF(data);
+
        c = malloc(sizeof(*c));
+       if (c == NULL)
+               return NULL;
+       memset (c, 0, sizeof (*c));
+
        c->name = strdup(buf);
        c->callback = callback;
        c->data = data;
        c->next = NULL;
-       user_data = malloc(sizeof(*user_data));
-       user_data->free_func = cpy_destroy_user_data;
-       user_data->data = c;
-       register_function(buf, handler, user_data);
+
+       memset (&user_data, 0, sizeof (user_data));
+       user_data.free_func = cpy_destroy_user_data;
+       user_data.data = c;
+
+       register_function(buf, handler, &user_data);
        return cpy_string_to_unicode_or_bytes(buf);
 }
 
 static PyObject *cpy_register_read(PyObject *self, PyObject *args, PyObject *kwds) {
        char buf[512];
        cpy_callback_t *c = NULL;
-       user_data_t *user_data = NULL;
+       user_data_t user_data;
        double interval = 0;
        char *name = NULL;
        PyObject *callback = NULL, *data = NULL;
@@ -625,18 +634,26 @@ static PyObject *cpy_register_read(PyObject *self, PyObject *args, PyObject *kwd
        
        Py_INCREF(callback);
        Py_XINCREF(data);
+
        c = malloc(sizeof(*c));
+       if (c == NULL)
+               return NULL;
+       memset (c, 0, sizeof (*c));
+
        c->name = strdup(buf);
        c->callback = callback;
        c->data = data;
        c->next = NULL;
-       user_data = malloc(sizeof(*user_data));
-       user_data->free_func = cpy_destroy_user_data;
-       user_data->data = c;
+
+       memset (&user_data, 0, sizeof (user_data));
+       user_data.free_func = cpy_destroy_user_data;
+       user_data.data = c;
+
        ts.tv_sec = interval;
        ts.tv_nsec = (interval - ts.tv_sec) * 1000000000;
-       plugin_register_complex_read(/* group = */ NULL, buf,
-                       cpy_read_callback, &ts, user_data);
+       plugin_register_complex_read(/* group = */ "python", buf,
+                       cpy_read_callback, &ts, &user_data);
+
        return cpy_string_to_unicode_or_bytes(buf);
 }