X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcurl_xml.c;h=0f2b92b03ffb4eaec0ceb30731f34b15c738b7e2;hb=db35efb33e81d0a013e09a8a6ffa362ad5962f7c;hp=03ac0c1332f39f8bfc61f4c22889dbadd2b1e6e9;hpb=ff9e11ade5cfabf32c63fb19fc76cbbc4186bc5b;p=collectd.git diff --git a/src/curl_xml.c b/src/curl_xml.c index 03ac0c13..0f2b92b0 100644 --- a/src/curl_xml.c +++ b/src/curl_xml.c @@ -114,14 +114,14 @@ static size_t cx_curl_callback (void *buf, /* {{{ */ return (0); } - if (len <= 0) + if (len == 0) return (len); if ((db->buffer_fill + len) >= db->buffer_size) { char *temp; - temp = (char *) realloc (db->buffer, + temp = realloc (db->buffer, db->buffer_fill + len + 1); if (temp == NULL) { @@ -170,7 +170,6 @@ static void cx_list_free (llist_t *list) /* {{{ */ } llist_destroy (list); - list = NULL; } /* }}} void cx_list_free */ static void cx_free (void *arg) /* {{{ */ @@ -217,16 +216,19 @@ static void cx_free (void *arg) /* {{{ */ static int cx_config_append_string (const char *name, struct curl_slist **dest, /* {{{ */ oconfig_item_t *ci) { + struct curl_slist *temp = NULL; if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) { WARNING ("curl_xml plugin: `%s' needs exactly one string argument.", name); return (-1); } - *dest = curl_slist_append(*dest, ci->values[0].value.string); - if (*dest == NULL) + temp = curl_slist_append(*dest, ci->values[0].value.string); + if (temp == NULL) return (-1); + *dest = temp; + return (0); } /* }}} int cx_config_append_string */