talloc torture: avoid NULL dereference

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>

diff --git a/lib/talloc/testsuite.c b/lib/talloc/testsuite.c
index 35309e2af253a035e2653c74a6e50c838dddb686..a76a64716c8f5378c96c606d12c4e9deb691d94a 100644 (file)
--- a/lib/talloc/testsuite.c
+++ b/lib/talloc/testsuite.c
@@ -63,7 +63,9 @@ static double private_timeval_elapsed(struct timeval *tv)
 }
 
 #define torture_assert_str_equal(test, arg1, arg2, desc) \
-       if (arg1 == NULL && arg2 == NULL) {                             \
+       if (arg1 == NULL && arg2 == NULL) { /* OK, both NULL == equal */ \
+       } else if (arg1 == NULL || arg2 == NULL) {                      \
+               return false;                                           \
        } else if (strcmp(arg1, arg2)) {                        \
                printf("failure: %s [\n%s: Expected %s, got %s: %s\n]\n", \
                   test, __location__, arg1, arg2, desc); \