From: collectd bot <32910397+collectd-bot@users.noreply.github.com>
Date: Fri, 17 Nov 2017 13:29:29 +0000 (+0100)
Subject: Auto-Merge pull request #2540 from octo/cid/141009
X-Git-Tag: collectd-5.8.0~8
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=ac0af6c500b4474a530302794cd8e722ddf30900;hp=26442d500face649a45d9ca6c36fb87b3a6972ea

Auto-Merge pull request #2540 from octo/cid/141009

Automatically merged due to "Automerge" label
---

diff --git a/src/libcollectdclient/network_buffer.c b/src/libcollectdclient/network_buffer.c
index 662265d9..a0f8cfdc 100644
--- a/src/libcollectdclient/network_buffer.c
+++ b/src/libcollectdclient/network_buffer.c
@@ -255,6 +255,10 @@ static double htond(double val) /* {{{ */
 
 static int nb_add_values(char **ret_buffer, /* {{{ */
                          size_t *ret_buffer_len, const lcc_value_list_t *vl) {
+  if ((vl == NULL) || (vl->values_len < 1)) {
+    return EINVAL;
+  }
+
   char *packet_ptr;
   size_t packet_len;