Let check_sec.sh check for use of the unsafe malloc, realloc, free,

and strdup routines.  While we are on it, plug some memory leaks and
make some code understandable.

1 files changed, 3 insertions, 4 deletions

diff --git a/gnupgparse.c b/gnupgparse.c
index 7be19517..c7feca89 100644
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -108,7 +108,7 @@ static void fix_uid (char *uid)
       else if (ob-buf == n && (buf[n] = 0, strlen (buf) < n))
 	memcpy (uid, buf, n);
     }
-    free (buf);
+    safe_free ((void **) &buf);
     iconv_close (cd);
   }
 }
@@ -291,9 +291,8 @@ pgp_key_t *pgp_get_candidates (pgp_ring_t keyring, LIST * hints)
   if ((devnull = open ("/dev/null", O_RDWR)) == -1)
     return NULL;
 
-  free (_chs);
-  _chs = safe_strdup (Charset);
-
+  mutt_str_replace (&_chs, Charset);
+  
   thepid = pgp_invoke_list_keys (NULL, &fp, NULL, -1, -1, devnull,
 				 keyring, hints);
   if (thepid == -1)