[git] GPGME - branch, master, updated. gpgme-1.9.0-80-g56b27b2

by Andre Heinecke cvs at cvs.gnupg.org
Tue Nov 14 14:30:27 CET 2017


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  56b27b21d5f8dd95b9d6415c5e98b821774f3093 (commit)
      from  00daac15530eabed5e61d841b2df939c2242667c (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 56b27b21d5f8dd95b9d6415c5e98b821774f3093
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Nov 14 14:28:32 2017 +0100

    qt: Fix IODeviceDataProvider with Process
    
    * lang/qt/src/dataprovider.cpp (blocking_read): Keep
    reading if process is not atEnd.
    
    --
    This fixes a regression in Kleopatra that uses this dataprovider
    to chain the gpgtar process to the encryption / signing.

diff --git a/lang/qt/src/dataprovider.cpp b/lang/qt/src/dataprovider.cpp
index 0d527a0..a025a03 100644
--- a/lang/qt/src/dataprovider.cpp
+++ b/lang/qt/src/dataprovider.cpp
@@ -185,7 +185,11 @@ static qint64 blocking_read(const std::shared_ptr<QIODevice> &io, char *buffer,
                 if (p->error() == QProcess::UnknownError &&
                         p->exitStatus() == QProcess::NormalExit &&
                         p->exitCode() == 0) {
-                    return 0;
+                    if (io->atEnd()) {
+                        // EOF
+                        return 0;
+                    } // continue reading even if process ended to ensure
+                      // everything is read.
                 } else {
                     Error::setSystemError(GPG_ERR_EIO);
                     return -1;

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

Summary of changes:
 lang/qt/src/dataprovider.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


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




More information about the Gnupg-commits mailing list