X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_http.c;h=3d1fe3da09b99c0b9b68f8d17205e058089f07d0;hb=7535ee83bf0b12a168cee3c70e5fb97ed6dfc96c;hp=95132cf92f7bcd8d541bd53aa38a34b72de28c9a;hpb=f91dc17b98157dfd785759cf71e009a0e9c1a520;p=collectd.git

diff --git a/src/write_http.c b/src/write_http.c
index 95132cf9..3d1fe3da 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;
@@ -415,6 +419,9 @@ static int wh_write_command (const data_set_t *ds, const value_list_t *vl, /* {{
         }
         assert (command_len < cb->send_buffer_free);
 
+        /* Make scan-build happy. */
+        assert (cb->send_buffer != NULL);
+
         /* `command_len + 1' because `command_len' does not include the
          * trailing null byte. Neither does `send_buffer_fill'. */
         memcpy (cb->send_buffer + cb->send_buffer_fill,