X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/42dbc6b5efa87e868116549c5932ab62cf716568..f86410ff8aa00dc5c584541f387f77515a8cbd89:/keydb_pg.c

diff --git a/keydb_pg.c b/keydb_pg.c
index 76129fa..f1cd009 100644
--- a/keydb_pg.c
+++ b/keydb_pg.c
@@ -132,7 +132,8 @@ void endtrans(void)
  *	in and then parse_keys() to parse the packets into a publickey
  *	structure.
  */
-int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey, bool intrans)
+int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
+		bool intrans)
 {
 	struct openpgp_packet_list *packets = NULL;
 	PGresult *result = NULL;
@@ -174,6 +175,8 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey, bool intrans
 						&packets);
 				parse_keys(packets, publickey);
 				lo_close(dbconn, fd);
+				free_packet_list(packets);
+				packets = NULL;
 			}
 		}
 	} else if (PQresultStatus(result) != PGRES_TUPLES_OK) {
@@ -238,6 +241,8 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
 						&packets);
 				parse_keys(packets, publickey);
 				lo_close(dbconn, fd);
+				free_packet_list(packets);
+				packets = NULL;
 			}
 		}
 	} else if (PQresultStatus(result) != PGRES_TUPLES_OK) {
@@ -308,6 +313,8 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 		write_openpgp_stream(keydb_putchar, &fd, packets);
 		lo_close(dbconn, fd);
 	}
+	free_packet_list(packets);
+	packets = NULL;
 
 	snprintf(statement, 1023, 
 			"INSERT INTO onak_keys (keyid, keydata) VALUES "
@@ -499,9 +506,10 @@ struct ll *getkeysigs(uint64_t keyid)
 	PGresult *result = NULL;
 	uint64_t signer;
 	char statement[1024];
-	int i = 0;
+	int i, j;
 	int numsigs = 0;
 	bool intrans = false;
+	char *str;
 
 	if (!intrans) {
 		result = PQexec(dbconn, "BEGIN");
@@ -509,14 +517,25 @@ struct ll *getkeysigs(uint64_t keyid)
 	}
 
 	snprintf(statement, 1023,
-		"SELECT signer FROM onak_sigs WHERE signee = '%llX'",
+		"SELECT DISTINCT signer FROM onak_sigs WHERE signee = '%llX'",
 		keyid);
 	result = PQexec(dbconn, statement);
 
 	if (PQresultStatus(result) == PGRES_TUPLES_OK) {
 		numsigs = PQntuples(result);
 		for (i = 0; i < numsigs;  i++) {
-			signer = strtol(PQgetvalue(result, i, 0), NULL, 16);
+			j = 0;
+			signer = 0;
+			str = PQgetvalue(result, i, 0);
+			while (str[j] != 0) {
+				signer <<= 4;
+				if (str[j] >= '0' && str[j] <= '9') {
+					signer += str[j] - '0';
+				} else {
+					signer += str[j] - 'A' + 10;
+				}
+				j++;
+			}
 			sigs = lladd(sigs, createandaddtohash(signer));
 		}
 	} else if (PQresultStatus(result) != PGRES_TUPLES_OK) {