jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 06:50:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: avoid passing NULL strings to vprintf

Browse Source 
Some libc implementations will crash when NULL string arguments are given to
*printf.  Avoid passing NULL string arguments in the make check tests that did
so, and pass the string "(null)" instead.

Change-Id: I65f11a3eef88d1c7b210c867ae0c40018160f55a
Reviewed-on: https://gerrit.openafs.org/12377
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
This commit is contained in:
Michael Meffie 2016-08-22 19:53:34 -04:00 committed by Benjamin Kaduk
parent 4e0bc086d6
commit 2fe3a28c6e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/util/exec-alt-t.c
View File

@ -24,6 +24,7 @@
#define FAILSTR "exec test failure\n" #define FAILSTR "exec test failure\n"
#define ARGSTRING "teststring" #define ARGSTRING "teststring"
#define PSTR(s) ((s) != NULL ? (s) : "(null)")
static struct exec_test { static struct exec_test {
const char *prefix; /* program prefix to run */ const char *prefix; /* program prefix to run */
@ -196,7 +197,7 @@ main(int argc, char **argv)
nBytes = read(fds[0], buf, sizeof(buf)-1); nBytes = read(fds[0], buf, sizeof(buf)-1);
is_int(result_len, nBytes, is_int(result_len, nBytes,
"child output size for prefix=%s, suffix=%s", "child output size for prefix=%s, suffix=%s",
t->prefix, t->suffix); PSTR(t->prefix), PSTR(t->suffix));
if (nBytes < 0) { if (nBytes < 0) {
skip("read() failed; cannot test read buffer"); skip("read() failed; cannot test read buffer");
@ -206,7 +207,7 @@ main(int argc, char **argv)
is_string(result, buf, is_string(result, buf,
"child output for prefix=%s, suffix=%s", "child output for prefix=%s, suffix=%s",
t->prefix, t->suffix); PSTR(t->prefix), PSTR(t->suffix));
} }
if (close(fds[0])) { if (close(fds[0])) {
@ -225,12 +226,12 @@ main(int argc, char **argv)
} }
ok(WIFEXITED(status), "child exited for prefix=%s, suffix=%s", ok(WIFEXITED(status), "child exited for prefix=%s, suffix=%s",
t->prefix, t->suffix); PSTR(t->prefix), PSTR(t->suffix));
if (WIFEXITED(status)) { if (WIFEXITED(status)) {
is_int(0, WEXITSTATUS(status), is_int(0, WEXITSTATUS(status),
"child exit code for prefix=%s, suffix=%s", "child exit code for prefix=%s, suffix=%s",
t->prefix, t->suffix); PSTR(t->prefix), PSTR(t->suffix));
} else { } else {
skip("!WIFEXITED(status) (status=%d), cannot check exit code", skip("!WIFEXITED(status) (status=%d), cannot check exit code",
status); status);