[git] GnuPG - branch, STABLE-BRANCH-1-4, updated. gnupg-1.4.19-12-g6db18e2

[by Werner Koch]

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, STABLE-BRANCH-1-4 has been updated
       via  6db18e29eb81b37ed6feb592add77d492c60fc35 (commit)
      from  9232df23ac545e358d10c5539bdc9de2d05f15e8 (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 6db18e29eb81b37ed6feb592add77d492c60fc35
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Sep 18 15:08:51 2014 +0200

    gpg: Silence a compiler warning.
    
    * g10/parse-packet.c (enum_sig_subpkt): Replace hack.
    
    --
    
    GCC 5 failure reported by Kevin Locke <kevin at kevinlocke.name>
    
    (backport from master commit 6a0c3fa19cfcdd590b96691e8a8ffb48fb5e0ec4)

diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 8d4450c..beee77e 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -1183,10 +1183,10 @@ enum_sig_subpkt( const subpktarea_t *pktbuf, sigsubpkttype_t reqtype,
       critical=&critical_dummy;
 
     if( !pktbuf || reqseq == -1 ) {
-	/* return some value different from NULL to indicate that
-	 * there is no critical bit we do not understand.  The caller
-	 * will never use the value.  Yes I know, it is an ugly hack */
-	return reqtype == SIGSUBPKT_TEST_CRITICAL? (const byte*)&pktbuf : NULL;
+	static char dummy[] = "x";
+	/* Return a value different from NULL to indicate that
+	 * there is no critical bit we do not understand.  */
+	return reqtype == SIGSUBPKT_TEST_CRITICAL ? dummy : NULL;
     }
     buffer = pktbuf->data;
     buflen = pktbuf->len;

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

Summary of changes:
 g10/parse-packet.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


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