[git] GPGME - branch, master, updated. gpgme-1.6.0-210-gde74fe5

[by Justus Winter]

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  de74fe59feef9adc858ac04004880bfd44315d0d (commit)
      from  8a93f345b701332270c9829a4d0a93537f98a8d8 (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 de74fe59feef9adc858ac04004880bfd44315d0d
Author: Justus Winter <justus at g10code.com>
Date:   Fri Jul 8 18:00:01 2016 +0200

    src: Fix error handling.
    
    * src/encrypt.c (encrypt_status_handler): Fix error handling, ||
    conflates errors.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/src/encrypt.c b/src/encrypt.c
index 8672cd3..307c862 100644
--- a/src/encrypt.c
+++ b/src/encrypt.c
@@ -184,8 +184,13 @@ encrypt_sym_status_handler (void *priv, gpgme_status_code_t code, char *args)
 static gpgme_error_t
 encrypt_status_handler (void *priv, gpgme_status_code_t code, char *args)
 {
-  return _gpgme_progress_status_handler (priv, code, args)
-    || _gpgme_encrypt_status_handler (priv, code, args);
+  gpgme_error_t err;
+
+  err = _gpgme_progress_status_handler (priv, code, args);
+  if (!err)
+    err = _gpgme_encrypt_status_handler (priv, code, args);
+
+  return err;
 }
 
 

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

Summary of changes:
 src/encrypt.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)


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