diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 2 | ||||
| -rw-r--r-- | g10/armor.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 78c4799cc..698861917 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,7 @@ 2010-05-12 Werner Koch <[email protected]> + * armor.c (radix64_read): Change fix 2006-04-28 to fix bug#1179. + * plaintext.c (handle_plaintext): Check return code of fflush. Fixes bug#1207. diff --git a/g10/armor.c b/g10/armor.c index 2dde9fe05..652ef3af6 100644 --- a/g10/armor.c +++ b/g10/armor.c @@ -1,4 +1,4 @@ -/* armor.c - Armor flter +/* armor.c - Armor filter * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, * 2007 Free Software Foundation, Inc. * @@ -797,8 +797,9 @@ radix64_read( armor_filter_context_t *afx, IOBUF a, size_t *retn, goto again; } } - else if(n==0) - onlypad=1; + + if (!n) + onlypad = 1; if( idx == 1 ) buf[n++] = val; |