[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta783-29-g3d250d2

[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, master has been updated
       via  3d250d21d36e8a0935b645f1ed5134ef9083530e (commit)
      from  84419f42da0fd436a9e0e669730157e74ce38b77 (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 3d250d21d36e8a0935b645f1ed5134ef9083530e
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Sep 11 16:40:45 2014 +0200

    gpg: Stop early on bogus old style comment packets.
    
    * g10/parse-packet.c (parse_key): Take care of too short packets for
    old style commet packets.
    --
    
    GnuPG-bug-id: 1714

diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index cfae788..edaa84d 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -1978,7 +1978,9 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
 	  for (; pktlen; pktlen--)
 	    {
 	      int c;
-	      c = iobuf_get_noeof (inp);
+	      c = iobuf_get (inp);
+              if (c == -1)
+                break; /* Ooops: shorter than indicated.  */
 	      if (c >= ' ' && c <= 'z')
 		es_putc (c, listfp);
 	      else

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

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


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