[Pkg-gnupg-commit] [gnupg2] 140/241: gpg: Correctly handle an error.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 848726f5c02faddb0b0fd24ce1a66893f5325675
Author: Neal H. Walfield <neal at g10code.com>
Date:   Tue Nov 17 12:56:55 2015 +0100

    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 at g10code.com>
---
 g10/keyring.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/g10/keyring.c b/g10/keyring.c
index e9e3ffc..cd569fd 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);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git