diff options
author | Werner Koch <[email protected]> | 2016-01-06 07:31:38 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2016-01-06 07:31:38 +0000 |
commit | 0a00115ee2049ab2357b7a14a51c7da185ffcabd (patch) | |
tree | 8ba811680a3ea2a736a8385534127c7ba5676c57 /common/t-convert.c | |
parent | gpg: Align notes about minimal keysize with actual checks. (diff) | |
download | gnupg-0a00115ee2049ab2357b7a14a51c7da185ffcabd.tar.gz gnupg-0a00115ee2049ab2357b7a14a51c7da185ffcabd.zip |
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 <[email protected]>
Diffstat (limited to 'common/t-convert.c')
-rw-r--r-- | common/t-convert.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/t-convert.c b/common/t-convert.c index a03c680ad..ad33dff9b 100644 --- a/common/t-convert.c +++ b/common/t-convert.c @@ -232,13 +232,13 @@ test_bin2hex (void) p = bin2hex (stuff, 20, NULL); if (!p) fail (0); - if (strcmp (p, hexstuff)) + else if (strcmp (p, hexstuff)) fail (0); p = bin2hex (stuff, (size_t)(-1), NULL); if (p) fail (0); - if (errno != ENOMEM) + else if (errno != ENOMEM) fail (1); } @@ -264,13 +264,13 @@ test_bin2hexcolon (void) p = bin2hexcolon (stuff, 20, NULL); if (!p) fail (0); - if (strcmp (p, hexstuff)) + else if (strcmp (p, hexstuff)) fail (0); p = bin2hexcolon (stuff, (size_t)(-1), NULL); if (p) fail (0); - if (errno != ENOMEM) + else if (errno != ENOMEM) fail (1); } |