[git] GnuPG - branch, master, updated. gnupg-2.1.20-64-gf52f6af

[by NIIBE Yutaka]

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 "The GNU Privacy Guard".

The branch, master has been updated
       via  f52f6af834cc488d11612e349e4af023d69a45f4 (commit)
       via  7ae1857c90ab43ad9e31f0fb6dbd37f25cc37278 (commit)
      from  7b4edf14bb16fbe786e55b829a208960396ce8df (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 f52f6af834cc488d11612e349e4af023d69a45f4
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Apr 12 16:01:16 2017 +0900

    tools: Fix condition for gpg-connect-agent.
    
    * tools/gpg-connect-agent.c (start_agent): Add paren.
    
    --
    
    The intention is comparing the error code depending opt.use_dirmngr.
    Considering C Operator Precedence, we should have paren here.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index ef71d27..f20d331 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -2237,7 +2237,7 @@ start_agent (void)
     {
       if (!opt.autostart
           && (gpg_err_code (err)
-              == opt.use_dirmngr? GPG_ERR_NO_DIRMNGR : GPG_ERR_NO_AGENT))
+              == (opt.use_dirmngr? GPG_ERR_NO_DIRMNGR : GPG_ERR_NO_AGENT)))
         {
           /* In the no-autostart case we don't make gpg-connect-agent
              fail on a missing server.  */

commit 7ae1857c90ab43ad9e31f0fb6dbd37f25cc37278
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Apr 12 15:58:11 2017 +0900

    dirmngr: Fix possible null reference.
    
    * dirmngr/dns.c (dns_error_t dns_trace_fput): Check NULL.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/dirmngr/dns.c b/dirmngr/dns.c
index 39d3295..9bba329 100644
--- a/dirmngr/dns.c
+++ b/dirmngr/dns.c
@@ -4606,8 +4606,9 @@ dns_error_t dns_trace_fput(const struct dns_trace_event *te, const void *data, s
 
 	if (fwrite(&tmp, 1, headsize, fp) < headsize)
 		return errno;
-	if (fwrite(data, 1, datasize, fp) < datasize)
-		return errno;
+	if (data)
+		if (fwrite(data, 1, datasize, fp) < datasize)
+			return errno;
 	if (fflush(fp))
 		return errno;
 

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

Summary of changes:
 dirmngr/dns.c             | 5 +++--
 tools/gpg-connect-agent.c | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org