security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-10 13:04:23 +01:00
Code Activity

Backport bug fix. Fixes bug#1240.

Browse Source
This commit is contained in:
Werner Koch 2010-06-18 08:08:49 +00:00
parent 68e18c961d
commit 5eb6899f3e
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2010-06-18 Werner Koch <wk@g10code.com>
* parse-packet.c (skip_packet, parse_gpg_control): Take care of
premature EOFs. Backport from trunk.
2010-06-17 Werner Koch <wk@g10code.com> 2010-06-17 Werner Koch <wk@g10code.com>
* gpg.c (main): Use CAST5 as default s2k algo. The macro * gpg.c (main): Use CAST5 as default s2k algo. The macro

12
g10/parse-packet.c
View File

@ -682,7 +682,11 @@ skip_packet( IOBUF inp, int pkttype, unsigned long pktlen, int partial )
else else
{ {
for( ; pktlen; pktlen-- ) for( ; pktlen; pktlen-- )
dump_hex_line(iobuf_get(inp), &i); {
dump_hex_line ((c=iobuf_get(inp)), &i);
if (c == -1)
break;
}
} }
putc ('\n', listfp); putc ('\n', listfp);
return; return;
@ -2529,7 +2533,11 @@ parse_gpg_control (IOBUF inp, int pkttype, unsigned long pktlen,
} }
else { else {
for( ; pktlen; pktlen-- ) for( ; pktlen; pktlen-- )
dump_hex_line(iobuf_get(inp), &i); {
dump_hex_line ((c=iobuf_get (inp)), &i);
if (c == -1)
break;
}
} }
putc ('\n', listfp); putc ('\n', listfp);
} }