[git] GnuPG - branch, master, updated. gnupg-2.1.20-77-gb9440aa

[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  b9440aa3693a4bb91e1ba8ff09e2d93ff22dd70a (commit)
       via  256e861bce3dc9aba8fab4df47a40cae3bede175 (commit)
      from  0dec0cc281dfa26db89f8cc5ee002dea5c2b2e81 (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 b9440aa3693a4bb91e1ba8ff09e2d93ff22dd70a
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Apr 17 09:44:37 2017 +0900

    tests: Minor memory fix.
    
    * tests/openpgp/fake-pinentry.c (get_passphrase): Free the memory.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/tests/openpgp/fake-pinentry.c b/tests/openpgp/fake-pinentry.c
index 6585b01..fb0c6ae 100644
--- a/tests/openpgp/fake-pinentry.c
+++ b/tests/openpgp/fake-pinentry.c
@@ -126,6 +126,8 @@ get_passphrase (const char *fname)
                fname, fname_new, strerror (errno));
       exit (1);
     }
+
+  free (fname_new);
   return passphrase;
 }
 

commit 256e861bce3dc9aba8fab4df47a40cae3bede175
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Apr 17 09:33:19 2017 +0900

    g10: Fix parse_ring_trust.
    
    * g10/parse-packet.c (parse_ring_trust): Fix condition.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 2be9849..fa44f83 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -2948,7 +2948,7 @@ parse_ring_trust (parse_packet_ctx_t ctx, unsigned long pktlen)
       if (namelen && pktlen)
         {
           rt.url = xtrymalloc (namelen + 1);
-          if (rt.url)
+          if (!rt.url)
             {
               err = gpg_error_from_syserror ();
               goto leave;

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

Summary of changes:
 g10/parse-packet.c            | 2 +-
 tests/openpgp/fake-pinentry.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)


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