diff options
author | Jeff King <peff@peff.net> | 2017-10-19 13:46:21 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-10-21 21:29:00 +0900 |
commit | cc61cf465f7777d0aebd1a35ca72650fef8f253f (patch) | |
tree | d40fd073b1eebc883e95b15a7b3fc052770a4fc9 | |
parent | 4843cdefe3f30d19c1b2cf601522152c1413459a (diff) | |
download | git-cc61cf465f7777d0aebd1a35ca72650fef8f253f.tar.gz |
test-ref-store: avoid passing NULL to printf
It's possible for resolve_ref_unsafe() to return NULL (e.g.,
if we are reading and the ref does not exist), in which case
we'll pass NULL to printf. On glibc systems this produces
"(null)", but on others it may segfault.
The tests don't expect any such case, but if we ever did
trigger this, we would prefer to cleanly fail the test with
unexpected input rather than segfault. Let's manually
replace NULL with "(null)". The exact value doesn't matter,
as it won't match any possible ref the caller could expect
(and anyway, the exit code of the program will tell whether
"ref" is valid or not).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | t/helper/test-ref-store.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c index 05d8c4d8af..6ec2670044 100644 --- a/t/helper/test-ref-store.c +++ b/t/helper/test-ref-store.c @@ -135,7 +135,7 @@ static int cmd_resolve_ref(struct ref_store *refs, const char **argv) ref = refs_resolve_ref_unsafe(refs, refname, resolve_flags, sha1, &flags); - printf("%s %s 0x%x\n", sha1_to_hex(sha1), ref, flags); + printf("%s %s 0x%x\n", sha1_to_hex(sha1), ref ? ref : "(null)", flags); return ref ? 0 : 1; } |