From 57fd96a7cf05bcca21ac54a4f9d3926ea986355b Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 9 Jan 2015 16:19:13 +0100 Subject: [PATCH] tests: Fix crash when getstarg() fails Screwed up when test-suite-only command __cmd was added in commit e852d45. Should never happen with the intended use. Fix it anyway. Signed-off-by: Markus Armbruster --- src/lib/commands/testing.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lib/commands/testing.c b/src/lib/commands/testing.c index 8ce5616a..7fdfdd15 100644 --- a/src/lib/commands/testing.c +++ b/src/lib/commands/testing.c @@ -27,7 +27,7 @@ * testing.c: Commands for test-suite use * * Known contributors to this file: - * Markus Armbruster, 2014 + * Markus Armbruster, 2014-2015 */ #include @@ -46,10 +46,16 @@ testing_cmd(void) return RET_SYN; if (!strcmp(p, "added")) { p = getstarg(player->argp[2], "number? ", buf); + if (!p || !*p) + return RET_SYN; test_suite_prng_seed -= strtol(p, NULL, 10); p = getstarg(player->argp[3], "BTUs? ", buf); + if (!p || !*p) + return RET_SYN; player->btused -= strtol(p, NULL, 10); p = getstarg(player->argp[4], "money? ", buf); + if (!p) + return RET_SYN; player->dolcost -= strtod(p, NULL); return RET_OK; }