From: Florian Forster <octo@collectd.org>
Date: Sun, 14 Aug 2016 18:47:15 +0000 (+0200)
Subject: write_http plugin: Sanity check arguments to wh_write_command().
X-Git-Tag: collectd-5.6.0~28
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=2e80174b4aa0b983c193453b1062677a0d28188c;p=collectd.git

write_http plugin: Sanity check arguments to wh_write_command().

Issue: #1835
---

diff --git a/src/write_http.c b/src/write_http.c
index 95132cf9..41615d3f 100644
--- a/src/write_http.c
+++ b/src/write_http.c
@@ -362,7 +362,11 @@ static int wh_write_command (const data_set_t *ds, const value_list_t *vl, /* {{
 
         int status;
 
-        if (0 != strcmp (ds->type, vl->type)) {
+        /* sanity checks, primarily to make static analyzers happy. */
+        if ((cb == NULL) || (cb->send_buffer == NULL))
+                return -1;
+
+        if (strcmp (ds->type, vl->type) == 0) {
                 ERROR ("write_http plugin: DS type does not match "
                                 "value list type");
                 return -1;