sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-12 20:58:37 +03:00
Code

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

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

Found by GCC 9.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13937

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit a8f773e326d6bdfc1c9eb87a74c00108f6620c56)
This commit is contained in:
Andreas Schneider 2019-05-08 16:54:30 +02:00 committed by Karolin Seeger
parent a81f78ce4e
commit 4113054a7c
1 changed files with 5 additions and 3 deletions

6
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)
@ -333,7 +335,7 @@ void torture_result(struct torture_context *test,
if (strcmp_safe(__got, __expected) != 0) { \
torture_result(torture_ctx, TORTURE_FAIL, \
__location__": "#got" was %s, expected %s: %s", \
__got, __expected, cmt); \
__got, __expected == NULL ? "NULL" : __expected, cmt); \
return false; \
} \
} while(0)