X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/e02c731dfbb288c736f2cd09a9b6df0507c59ddd..6e5b15819a125240c19a44db59894a04eeee7b41:/keydb.c

diff --git a/keydb.c b/keydb.c
index 3ebb056..3acf711 100644
--- a/keydb.c
+++ b/keydb.c
@@ -32,7 +32,7 @@ char *keyid2uid(uint64_t keyid)
 {
 	struct openpgp_publickey *publickey = NULL;
 	struct openpgp_signedpacket_list *curuid = NULL;
-	static char buf[1024];
+	char buf[1024];
 
 	buf[0]=0;
 	if (fetch_key(keyid, &publickey, false) && publickey != NULL) {
@@ -51,7 +51,7 @@ char *keyid2uid(uint64_t keyid)
 	if (buf[0] == 0) {
 		return NULL;
 	} else {
-		return buf;
+		return strdup(buf);
 	}
 }
 #endif
@@ -89,16 +89,21 @@ struct ll *getkeysigs(uint64_t keyid)
  *	@keyid: The 32bit keyid.
  *
  *	This function maps a 32bit key id to the full 64bit one. It returns the
- *	full keyid.
+ *	full keyid. If the key isn't found a keyid of 0 is returned.
  */
 uint64_t getfullkeyid(uint64_t keyid)
 {
 	struct openpgp_publickey *publickey = NULL;
 
-	if (keyid < 0x100000000) {
+	if (keyid < 0x100000000LL) {
 		fetch_key(keyid, &publickey, false);
-		keyid = get_keyid(publickey);
-		free_publickey(publickey);
+		if (publickey != NULL) {
+			keyid = get_keyid(publickey);
+			free_publickey(publickey);
+			publickey = NULL;
+		} else {
+			keyid = 0;
+		}
 	}
 	
 	return keyid;