From c0268c449d0f3d23be5ec7b92fe92e7e078166cf Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Mon, 8 Feb 2016 00:31:35 +0100 Subject: gpg: Fix format_keyid when dynamically allocating the buffer. * g10/keyid.c (format_keyid): Return a char *, not a const char *. If BUFFER is NULL, then set LEN to the static buffer's size. -- Signed-off-by: Neal H. Walfield --- g10/keyid.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'g10/keyid.c') diff --git a/g10/keyid.c b/g10/keyid.c index f6842762e..49eb5f6d5 100644 --- a/g10/keyid.c +++ b/g10/keyid.c @@ -274,12 +274,15 @@ v3_keyid (gcry_mpi_t a, u32 *ki) } -const char * +char * format_keyid (u32 *keyid, int format, char *buffer, int len) { char tmp[KEYID_STR_SIZE]; if (! buffer) - buffer = tmp; + { + buffer = tmp; + len = sizeof (tmp); + } if (format == KF_DEFAULT) format = opt.keyid_format; -- cgit v1.2.3