mirror of
git://git.gnupg.org/gnupg.git
synced 2025-04-17 15:44:34 +02:00
gpg: Fix format_keyid.
* g10/keyid.c (format_keyid): Allocate buffer earlier. -- Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
07671917e4
commit
a9be9f4e6e
@ -357,11 +357,12 @@ keyid_copy (u32 *dest, const u32 *src)
|
|||||||
char *
|
char *
|
||||||
format_keyid (u32 *keyid, int format, char *buffer, int len)
|
format_keyid (u32 *keyid, int format, char *buffer, int len)
|
||||||
{
|
{
|
||||||
char tmp[KEYID_STR_SIZE];
|
|
||||||
if (! buffer)
|
if (! buffer)
|
||||||
{
|
{
|
||||||
buffer = tmp;
|
len = KEYID_STR_SIZE;
|
||||||
len = sizeof (tmp);
|
buffer = xtrymalloc (len);
|
||||||
|
if (!buffer)
|
||||||
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (format == KF_DEFAULT)
|
if (format == KF_DEFAULT)
|
||||||
@ -396,8 +397,6 @@ format_keyid (u32 *keyid, int format, char *buffer, int len)
|
|||||||
BUG();
|
BUG();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (buffer == tmp)
|
|
||||||
return xstrdup (buffer);
|
|
||||||
return buffer;
|
return buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user