From: Martin Schwenke <martin@meltin.net>
Date: Fri, 21 Jun 2019 06:08:58 +0000 (+1000)
Subject: ctdb-tests: Avoid warning about NULL dereference
X-Git-Tag: samba-4.11.0rc1~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75747c6106fa2a966686f7a523cdb9d28708b870;p=thirdparty%2Fsamba.git

ctdb-tests: Avoid warning about NULL dereference

Static analysis finds that earlier in the call path, ctdb_string_len()
checks for NULL, so complains that a NULL value can be passed to
strlen() here.  Avoid this by adding an assert().

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/tests/src/protocol_types_compat_test.c b/ctdb/tests/src/protocol_types_compat_test.c
index 0f1e548d099..59aef825b72 100644
--- a/ctdb/tests/src/protocol_types_compat_test.c
+++ b/ctdb/tests/src/protocol_types_compat_test.c
@@ -838,6 +838,7 @@ static size_t ctdb_var_list_len_old(struct ctdb_var_list *in)
 	size_t len = sizeof(uint32_t);
 
 	for (i=0; i<in->count; i++) {
+		assert(in->var[i] != NULL);
 		len += strlen(in->var[i]) + 1;
 	}
 	return len;