[Pkg-gnupg-commit] [gpgme] 210/412: src: Fix error handling.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gpgme.

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>
---
 src/encrypt.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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;
 }
 
 

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