diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/keygen.c | 2 | ||||
| -rw-r--r-- | g10/parse-packet.c | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index ec0778c5f..69e43614f 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,10 @@ +2007-01-15 Werner Koch <[email protected]> + + * parse-packet.c (read_protected_v3_mpi): Make sure to stop + reading even for corrupted packets. + * keygen.c (generate_user_id): Need to allocate one byte more. + Reported by Felix von Leitner. + 2006-12-21 Werner Koch <[email protected]> * gpg.c (main): New command --server. diff --git a/g10/keygen.c b/g10/keygen.c index 1335eafff..2db4ab210 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -2130,7 +2130,7 @@ generate_user_id() if( !p ) return NULL; n = strlen(p); - uid = xmalloc_clear( sizeof *uid + n - 1 ); + uid = xmalloc_clear( sizeof *uid + n ); uid->len = n; strcpy(uid->name, p); uid->ref = 1; diff --git a/g10/parse-packet.c b/g10/parse-packet.c index d60d5d7dd..ae0cc2821 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -1589,11 +1589,11 @@ read_protected_v3_mpi (IOBUF inp, unsigned long *length) buf = p = xmalloc (2 + nbytes); *p++ = nbits >> 8; *p++ = nbits; - for (; nbytes && length; nbytes--, --*length) + for (; nbytes && *length; nbytes--, --*length) *p++ = iobuf_get (inp); if (nbytes) { - log_error ("packet shorter tham mpi\n"); + log_error ("packet shorter than mpi\n"); xfree (buf); return NULL; } |