From 0a00115ee2049ab2357b7a14a51c7da185ffcabd Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 6 Jan 2016 08:31:38 +0100 Subject: common: Do not deref vars in tests after a fail(). * common/t-convert.c (test_bin2hex): Turn if conditions into if-else chains to avoid accessing unchecked data. (test_bin2hexcolon): Ditto. * common/t-mapstrings.c (test_map_static_macro_string): Ditto. * common/t-stringhelp.c (test_percent_escape): Ditto. (test_make_filename_try): Ditto. (test_make_absfilename_try): Ditto. * common/t-timestuff.c (test_timegm): Ditto. -- Note that these dereference only occur after failed regression tests. Signed-off-by: Werner Koch --- common/t-mapstrings.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/t-mapstrings.c') diff --git a/common/t-mapstrings.c b/common/t-mapstrings.c index 88c6674bf..8f4c6507b 100644 --- a/common/t-mapstrings.c +++ b/common/t-mapstrings.c @@ -68,7 +68,7 @@ test_map_static_macro_string (void) result = map_static_macro_string (tests[testno].string); if (!result) fail (testno); - if (strcmp (result, tests[testno].expected)) + else if (strcmp (result, tests[testno].expected)) fail (testno); if (!tests[testno].lastresult) tests[testno].lastresult = result; @@ -80,7 +80,7 @@ test_map_static_macro_string (void) result = map_static_macro_string (tests[testno].string); if (!result) fail (testno); - if (strcmp (result, tests[testno].expected)) + else if (strcmp (result, tests[testno].expected)) fail (testno); if (result != tests[testno].lastresult) fail (testno); -- cgit v1.2.3