Fix segfault with non existant short key id & keydb_fs.

[onak.git] / wordlist.c

diff --git a/wordlist.c b/wordlist.c
index 0a9a836a67e10c7c2ca5e57c609f72edfe3f9c63..71299e12c88fd3e811965bbd337ba8c9ad07fd5b 100644 (file)
--- a/wordlist.c
+++ b/wordlist.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2004 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2004 Project Purple

- *
- * $Id: wordlist.c,v 1.1 2004/05/27 03:34:35 noodles Exp $

  */
 
 #include <ctype.h>
  */
 
 #include <ctype.h>


@@ -56,7 +54,9 @@ struct ll *makewordlist(struct ll *wordlist, char *word)
                                end++;
                        }
 
                                end++;
                        }
 

-                       if (llfind(wordlist, start, strcmp) == NULL) {
+                       if (llfind(wordlist, start, 
+                               (int (*)(const void *, const void *)) strcmp
+                                       ) == NULL) {

                                wordlist = lladd(wordlist, start);
                        }
                }
                                wordlist = lladd(wordlist, start);
                        }
                }


@@ -80,12 +80,21 @@ struct ll *makewordlist(struct ll *wordlist, char *word)
 struct ll *makewordlistfromkey(struct ll *wordlist,
                               struct openpgp_publickey *key)
 {
 struct ll *makewordlistfromkey(struct ll *wordlist,
                               struct openpgp_publickey *key)
 {

-       char **uids;
-       int i;
+       char      **uids;
+       int         i;
+       struct ll  *words = NULL;
+       struct ll  *wl = NULL;

 
        uids = keyuids(key, NULL);
        for (i = 0; uids[i] != NULL; ++i) {
 
        uids = keyuids(key, NULL);
        for (i = 0; uids[i] != NULL; ++i) {

-               wordlist = makewordlist(wordlist, uids[i]);
+               words = makewordlist(NULL, uids[i]);
+               for (wl = words; wl != NULL; wl = wl->next) {
+                       if (llfind(wordlist, wl->object, 
+                               (int (*)(const void *, const void *)) strcmp
+                                               ) == NULL) {
+                               wordlist = lladd(wordlist, strdup(wl->object));
+                       }
+               }

                free(uids[i]);
                uids[i] = NULL;
        }
                free(uids[i]);
                uids[i] = NULL;
        }