diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2019-05-02 11:29:34 +1200 |
|---|---|---|
| committer | Douglas Bagnall <dbagnall@samba.org> | 2019-05-09 22:39:26 +0000 |
| commit | ff2b0e242618d048178a00412c48482d728c97bd (patch) | |
| tree | b760f7e61958ab6d5e9bc1f4cf28193283ad9d96 /lib/talloc | |
| parent | 219bc189472acff24410009ee16a409e0aaf8eef (diff) | |
| download | samba-ff2b0e242618d048178a00412c48482d728c97bd.tar.gz | |
talloc torture: avoid NULL dereference
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Diffstat (limited to 'lib/talloc')
| -rw-r--r-- | lib/talloc/testsuite.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/talloc/testsuite.c b/lib/talloc/testsuite.c index 35309e2af25..a76a64716c8 100644 --- 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); \ |