[git] GPGME - branch, master, updated. gpgme-1.11.1-2-g7706fa2

[by Andre Heinecke]

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 "GnuPG Made Easy".

The branch, master has been updated
       via  7706fa2c922f5e02570b01f145ed474e82341042 (commit)
      from  302ec1f9aa396f2207e9a0e0b87ebee4d28d5df2 (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 7706fa2c922f5e02570b01f145ed474e82341042
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Apr 20 14:30:53 2018 +0200

    core: Do not modify args for ignored failures
    
    * src/op-support.c (_gpgme_parse_failure): Ignore gpg-exit failures
    before modifying args.
    
    --
    For op_decrypt_verify the status handler for both decrypt and
    verify would parse the failure when the first parser ignored
    the failure. This resulted in an ERR_INV_ENGINE as the first
    call to parse_failure modified the args.
    
    GnuPG-Bug-Id: T3919

diff --git a/src/op-support.c b/src/op-support.c
index 03f274c..9414e61 100644
--- a/src/op-support.c
+++ b/src/op-support.c
@@ -414,6 +414,9 @@ _gpgme_parse_failure (char *args)
 {
   char *where, *which;
 
+  if (!strncmp (args, "gpg-exit", 8))
+    return 0;
+
   where = strchr (args, ' ');
   if (!where)
     return trace_gpg_error (GPG_ERR_INV_ENGINE);
@@ -425,9 +428,5 @@ _gpgme_parse_failure (char *args)
   if (where)
     *where = '\0';
 
-  where = args;
-  if (!strcmp (where, "gpg-exit"))
-    return 0;
-
   return atoi (which);
 }

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

Summary of changes:
 src/op-support.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org