[git] GnuPG - branch, master, updated. gnupg-2.1.11-100-g60b34f9

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  60b34f96f4f390670462d719c0d797e622cee4d4 (commit)
      from  834b84c0ee4990393daa5e44afbab5b0aaed0758 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 60b34f96f4f390670462d719c0d797e622cee4d4
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Mar 15 09:22:24 2016 +0100

    gpg: Do not rely on a certain evaluation order.
    
    * g10/keyedit.c (print_and_check_one_sig): Call check_key_signature
    before derefing IS_SELFSIG.
    --
    
    Fixes-commit: 5fbd80579aea0f75ca1d2700515c5b8747a75c7d
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keyedit.c b/g10/keyedit.c
index d7c2a4b..e138efa 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -310,12 +310,16 @@ print_one_sig (int rc, KBNODE keyblock, KBNODE node,
   return (sigrc == '!');
 }
 
+
 static int
 print_and_check_one_sig (KBNODE keyblock, KBNODE node,
 			 int *inv_sigs, int *no_key, int *oth_err,
 			 int *is_selfsig, int print_without_key, int extended)
 {
-  return print_one_sig (check_key_signature (keyblock, node, is_selfsig),
+  int rc;
+
+  rc = check_key_signature (keyblock, node, is_selfsig);
+  return print_one_sig (rc,
                         keyblock, node, inv_sigs, no_key, oth_err,
                         *is_selfsig, print_without_key, extended);
 }

-----------------------------------------------------------------------

Summary of changes:
 g10/keyedit.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org