From a9be9f4e6e6d451698afa3d4780a53ed3718b30b Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Wed, 24 Nov 2021 10:43:38 +0900 Subject: [PATCH] gpg: Fix format_keyid. * g10/keyid.c (format_keyid): Allocate buffer earlier. -- Signed-off-by: NIIBE Yutaka --- g10/keyid.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/g10/keyid.c b/g10/keyid.c index 522cc9cda..cf459a192 100644 --- a/g10/keyid.c +++ b/g10/keyid.c @@ -357,11 +357,12 @@ keyid_copy (u32 *dest, const u32 *src) char * format_keyid (u32 *keyid, int format, char *buffer, int len) { - char tmp[KEYID_STR_SIZE]; if (! buffer) { - buffer = tmp; - len = sizeof (tmp); + len = KEYID_STR_SIZE; + buffer = xtrymalloc (len); + if (!buffer) + return NULL; } if (format == KF_DEFAULT) @@ -396,8 +397,6 @@ format_keyid (u32 *keyid, int format, char *buffer, int len) BUG(); } - if (buffer == tmp) - return xstrdup (buffer); return buffer; }