diff options
author | Werner Koch <wk@gnupg.org> | 2015-12-03 12:18:32 +0100 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2015-12-03 12:18:32 +0100 |
commit | a28ac99efead8be73ea1704abe1611ccc4811c54 (patch) | |
tree | c1370b2f8f80e8f3280d89b30142753e4694923f /g10/t-keydb-get-keyblock.c | |
parent | gpg: Change some error messages. (diff) | |
download | gnupg2-a28ac99efead8be73ea1704abe1611ccc4811c54.tar.xz gnupg2-a28ac99efead8be73ea1704abe1611ccc4811c54.zip |
gpg: Take care of keydb_new returning NULL.
* g10/keydb.c (keydb_new): Print an error message if needed. Also use
xtrycalloc because we return an error anyway.
* g10/delkey.c (do_delete_key): Handle error retruned by keydb_new.
* g10/export.c (do_export_stream): Ditto.
* g10/getkey.c (get_pubkey): Ditto.
(get_pubkey_fast): Ditto.
(get_pubkeyblock): Ditto.
(get_seckey): Ditto.
(key_byname): Ditto.
(get_pubkey_byfprint): Ditto.
(get_pubkey_byfprint_fast): Ditto.
(parse_def_secret_key): Ditto.
(have_secret_key_with_kid): Ditto.
* g10/import.c (import_one): Ditto.
(import_revoke_cert): Ditto.
* g10/keyedit.c (keyedit_quick_adduid): Ditto.
* g10/keygen.c (quick_generate_keypair): Ditto.
(do_generate_keypair): Ditto.
* g10/trustdb.c (validate_keys): Ditto.
* g10/keyserver.c (keyidlist): Ditto.
* g10/revoke.c (gen_desig_revoke): Ditto.
(gen_revoke): Ditto.
* g10/gpg.c (check_user_ids): Ditto.
(main): Do not print an error message for keydb_new error.
* g10/keylist.c (list_all): Use actual error code returned by
keydb_new.
* g10/t-keydb-get-keyblock.c (do_test): Abort on keydb_new error.
* g10/t-keydb.c (do_test): Ditto.
* g10/keyring.c (keyring_new): Actually return an error so that the
existing keydb_new error checking makes sense for a keyring resource.
(keyring_rebuild_cache): Take care of keyring_new returning an error.
--
Commit 04a6b903 changed keydb_new to return an error. However the
error was not checked at most places which we fix with this patch. To
make things easier keydb_new prints an error message itself.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/t-keydb-get-keyblock.c')
-rw-r--r-- | g10/t-keydb-get-keyblock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/g10/t-keydb-get-keyblock.c b/g10/t-keydb-get-keyblock.c index 2fbcb73e3..c12bab182 100644 --- a/g10/t-keydb-get-keyblock.c +++ b/g10/t-keydb-get-keyblock.c @@ -45,6 +45,8 @@ do_test (int argc, char *argv[]) ABORT ("Failed to open keyring."); hd1 = keydb_new (); + if (!hd1) + ABORT (""); rc = classify_user_id ("8061 5870 F5BA D690 3336 86D0 F2AD 85AC 1E42 B367", &desc1, 0); |