From 848726f5c02faddb0b0fd24ce1a66893f5325675 Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@g10code.com>
Date: Tue, 17 Nov 2015 12:56:55 +0100
Subject: [PATCH] gpg: Correctly handle an error.

* g10/keyring.c (keyring_search): If a compare function returns an
error, treat it as an error.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
---
 g10/keyring.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/g10/keyring.c b/g10/keyring.c
index e9e3ffcd1..cd569fd56 100644
--- a/g10/keyring.c
+++ b/g10/keyring.c
@@ -1202,6 +1202,9 @@ keyring_search (KEYRING_HANDLE hd, KEYDB_SEARCH_DESC *desc,
       free_packet (&pkt);
       continue;
     found:
+      if (rc)
+        goto real_found;
+
       if (DBG_LOOKUP)
         log_debug ("%s: packet starting at offset %zx matched descriptor %zd\n",
                    __func__, offset, n);