From: Andreas Schneider <asn@samba.org>
Date: Wed, 8 May 2019 14:54:30 +0000 (+0200)
Subject: lib:torture: Fix string comparison macros where we directly pass NULL
X-Git-Tag: tdb-1.4.1~158
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8f773e326d6bdfc1c9eb87a74c00108f6620c56;p=thirdparty%2Fsamba.git

lib:torture: Fix string comparison macros where we directly pass NULL

See e.g. lib/util/tests/strlist.c +177

Found by GCC 9.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/lib/torture/torture.h b/lib/torture/torture.h
index 2921ae74b9b..a7f3f471b3a 100644
--- a/lib/torture/torture.h
+++ b/lib/torture/torture.h
@@ -323,7 +323,9 @@ void torture_result(struct torture_context *test,
 #define torture_assert_casestr_equal(torture_ctx,got,expected,cmt) \
 	do { const char *__got = (got), *__expected = (expected); \
 	if (!strequal(__got, __expected)) { \
-		torture_result(torture_ctx, TORTURE_FAIL, __location__": "#got" was %s, expected %s: %s", __got, __expected, cmt); \
+		torture_result(torture_ctx, TORTURE_FAIL, \
+			       __location__": "#got" was %s, expected %s: %s", \
+			       __got, __expected == NULL ? "null" : __expected, cmt); \
 		return false; \
 	} \
 	} while(0)
@@ -332,8 +334,8 @@ void torture_result(struct torture_context *test,
 	do { const char *__got = (got), *__expected = (expected); \
 	if (strcmp_safe(__got, __expected) != 0) { \
 		torture_result(torture_ctx, TORTURE_FAIL, \
-					   __location__": "#got" was %s, expected %s: %s", \
-					   __got, __expected, cmt); \
+			       __location__": "#got" was %s, expected %s: %s", \
+			       __got, __expected == NULL ? "NULL" : __expected, cmt); \
 		return false; \
 	} \
 	} while(0)