GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Add safeguards against nullptr deref

Browse Source 
* t-gpgconf.c (main): Test some values before dereferencing them.
This commit is contained in:
Andre Heinecke 2017-01-17 15:20:56 +01:00
parent abfd241d1a
commit ca69df8c8d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/gpg/t-gpgconf.c
View File

@ -309,9 +309,10 @@ main (void)
fail_if_err (err); fail_if_err (err);
if (lookup (conf, "dirmngr", "verbose", &comp, &opt)) if (lookup (conf, "dirmngr", "verbose", &comp, &opt))
{ {
/* Found. */ /* Found. */
test (opt->alt_type == GPGME_CONF_NONE); test (opt->alt_type == GPGME_CONF_NONE);
test ((unsigned long) opt->value->value.count == count); test (opt->value);
test ((unsigned long) opt->value->value.count == count);
} }
fprintf (stderr, "."); fprintf (stderr, ".");
@ -350,9 +351,11 @@ main (void)
fail_if_err (err); fail_if_err (err);
if (lookup (conf, "gpg", "keyserver", &comp, &opt)) if (lookup (conf, "gpg", "keyserver", &comp, &opt))
{ {
/* Found. */ /* Found. */
test (opt->alt_type == GPGME_CONF_STRING); test (opt->alt_type == GPGME_CONF_STRING);
test (strcmp (opt->value->value.string, values[i%2]) == 0); test (opt->value);
test (opt->value->value.string);
test (strcmp (opt->value->value.string, values[i%2]) == 0);
} }
fprintf (stderr, "."); fprintf (stderr, ".");