[git] GPGME - branch, master, updated. gpgme-1.11.1-246-g7d3c13d

by Andre Heinecke cvs at cvs.gnupg.org
Tue Aug 28 08:05:52 CEST 2018


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  7d3c13df263ed88c17005920e75e0486abeae5b9 (commit)
      from  8aa61fd3a270c167bf85cdd3f4148c48f5ae9ff7 (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 7d3c13df263ed88c17005920e75e0486abeae5b9
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Aug 28 08:05:30 2018 +0200

    json: Allow NULL request in encode and chunk
    
    * src/gpgme-json.c (encode_and_chunk): Don't error on NULL
    request.
    
    --
    This fixes the error that is passed when parthing the json
    object failed and request would be NULL.
    Instead of the JSON parser error it would otherwise report
    that encode and chunk failed.

diff --git a/src/gpgme-json.c b/src/gpgme-json.c
index 8812024..0d1ec50 100644
--- a/src/gpgme-json.c
+++ b/src/gpgme-json.c
@@ -1521,7 +1521,7 @@ encode_and_chunk (cjson_t request, cjson_t response)
 {
   char *data;
   gpg_error_t err = 0;
-  size_t chunksize;
+  size_t chunksize = 0;
   char *getmore_request = NULL;
 
   if (opt_interactive)
@@ -1537,7 +1537,6 @@ encode_and_chunk (cjson_t request, cjson_t response)
 
   if (!request)
     {
-      err = GPG_ERR_INV_VALUE;
       goto leave;
     }
 

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

Summary of changes:
 src/gpgme-json.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


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




More information about the Gnupg-commits mailing list