From 956da89193370d5aa970cff5b77f605534481a02 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Fri, 14 Jul 2017 11:17:49 +0200 Subject: [PATCH] gpg: Fix importing keys. * g10/import.c (import_one): Fix error handling. Fixes-commit: 330212efb927c119bb5135856f8582c0e4e2e6b7 Signed-off-by: Justus Winter --- g10/import.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/g10/import.c b/g10/import.c index 8010fa521..1737479fa 100644 --- a/g10/import.c +++ b/g10/import.c @@ -1627,9 +1627,12 @@ import_one (ctrl_t ctrl, if ( !(options & IMPORT_RESTORE) ) { rc = apply_meta_data (keyblock, 0, origin); - log_error ("apply_meta_data failed: %s\n", gpg_strerror (rc)); - keydb_release (hd); - return GPG_ERR_GENERAL; + if (rc) + { + log_error ("apply_meta_data failed: %s\n", gpg_strerror (rc)); + keydb_release (hd); + return GPG_ERR_GENERAL; + } } rc = keydb_insert_keyblock (hd, keyblock );