If we can assume ret_keyblock != NULL (it is, in current implementation), it can be as simple as:
diff --git a/g10/getkey.c b/g10/getkey.c index 6802026f6..27bbd354c 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -1354,6 +1354,8 @@ get_best_pubkey_byname (ctrl_t ctrl, enum get_pubkey_modes mode, int is_mbox = is_valid_mailbox (name); int wkd_tried = 0;