From 3d250d21d36e8a0935b645f1ed5134ef9083530e Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Thu, 11 Sep 2014 16:40:45 +0200
Subject: [PATCH] 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
---
 g10/parse-packet.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index cfae788d5..edaa84da4 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