mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-03 12:11:33 +01:00
gpg: Make sure a user ID packet has always a terminating Nul in memory.
* g10/keygen.c (write_uid): Avoid overflow. -- Also the actual length if the user ID is given by LEN, using NAME diretcly is often more convenient.
This commit is contained in:
parent
681c6ef757
commit
d8bce478be
@ -202,7 +202,7 @@ write_uid( KBNODE root, const char *s )
|
||||
size_t n = strlen(s);
|
||||
|
||||
pkt->pkttype = PKT_USER_ID;
|
||||
pkt->pkt.user_id = xmalloc_clear( sizeof *pkt->pkt.user_id + n - 1 );
|
||||
pkt->pkt.user_id = xmalloc_clear (sizeof *pkt->pkt.user_id + n);
|
||||
pkt->pkt.user_id->len = n;
|
||||
pkt->pkt.user_id->ref = 1;
|
||||
strcpy(pkt->pkt.user_id->name, s);
|
||||
|
@ -293,7 +293,7 @@ typedef struct
|
||||
} flags;
|
||||
/* The text contained in the user id packet, which is normally the
|
||||
name and email address of the key holder (See RFC 4880 5.11).
|
||||
(Serialized.) */
|
||||
(Serialized.). For convenience an extra Nul is always appended. */
|
||||
char name[1];
|
||||
} PKT_user_id;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user