security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

g10/parse-packet.c:parse: Try harder to not ignore an EOF. 

* g10/parse-packet.c (parse): Be more robust: make sure to process any
EOF.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>.
This commit is contained in:
Neal H. Walfield 2015-08-19 13:41:12 +02:00
parent 24a72dffa7
commit 0add91ae1c
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
g10/parse-packet.c
View File

@ -549,16 +549,28 @@ parse (IOBUF inp, PACKET * pkt, int onlykeypkts, off_t * retpos,
}
else if (c == 255)
{
pktlen = (unsigned long)(hdr[hdrlen++] = iobuf_get_noeof (inp)) << 24;
pktlen |= (hdr[hdrlen++] = iobuf_get_noeof (inp)) << 16;
pktlen |= (hdr[hdrlen++] = iobuf_get_noeof (inp)) << 8;
if ((c = iobuf_get (inp)) == -1)
int i;
int eof = 0;
char value[4];
for (i = 0; i < 4; i ++)
if ((value[i] = hdr[hdrlen++] = iobuf_get (inp)) == -1)
{
eof = 1;
break;
}
if (eof)
{
log_error ("%s: 4 byte length invalid\n", iobuf_where (inp));
rc = gpg_error (GPG_ERR_INV_PACKET);
goto leave;
}
pktlen |= (hdr[hdrlen++] = c);
pktlen = (((unsigned long) value[0] << 24)
| ((unsigned long) value[1] << 16)
| ((unsigned long) value[2] << 8)
| ((unsigned long) value[3]));
}
else /* Partial body length. */
{
@ -611,7 +623,14 @@ parse (IOBUF inp, PACKET * pkt, int onlykeypkts, off_t * retpos,
for (; lenbytes; lenbytes--)
{
pktlen <<= 8;
pktlen |= hdr[hdrlen++] = iobuf_get_noeof (inp);
c = iobuf_get (inp);
if (c == -1)
{
log_error ("%s: length invalid\n", iobuf_where (inp));
rc = gpg_error (GPG_ERR_INV_PACKET);
goto leave;
}
pktlen |= hdr[hdrlen++] = c;
}
}
}