From: Jonathan McDowell <noodles@earth.li>
Date: Mon, 31 May 2004 23:48:21 +0000 (+0000)
Subject: cscvs to tla changeset 127
X-Git-Tag: 0.3.0~57
X-Git-Url: http://the.earth.li/gitweb/?a=commitdiff_plain;h=e57492c98069420201b291d1596116fb8dd437f0;p=onak.git

cscvs to tla changeset 127
Author: noodles
Date: 2004/05/27 03:24:01
Fix keyuids to cope with a NULL primary parameter (dsilvers).
---

diff --git a/decodekey.c b/decodekey.c
index 7172391..8fca176 100644
--- a/decodekey.c
+++ b/decodekey.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
- * $Id: decodekey.c,v 1.5 2004/03/23 12:35:11 noodles Exp $
+ * $Id: decodekey.c,v 1.6 2004/05/27 03:24:01 noodles Exp $
  */
 
 #include <assert.h>
@@ -218,8 +218,11 @@ char **keyuids(struct openpgp_publickey *key, char **primary)
 	char buf[1024];
 	char **uids = NULL;
 	int count = 0;
+        
+        if (primary != NULL) {
+        	*primary = NULL;
+	}
 
-	*primary = NULL;
 	if (key != NULL && key->uids != NULL) {
 		uids = malloc((spsize(key->uids) + 1) * sizeof (char *));