X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgppubring.c;h=e5f729e8e68409a35f4b4cbd63209ae9af1ea1a7;hp=b1c59ff9532319d07f076d5c136de4a36247349a;hb=d9ae612d6dba4f68f46a1a81eb77a326849f9184;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/pgppubring.c b/pgppubring.c
index b1c59ff..e5f729e 100644
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -26,6 +26,9 @@
 # include "config.h"
 #endif
 
+#include "lib/mem.h"
+#include "lib/str.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -707,7 +710,7 @@ static int pgpring_string_matches_hint (const char *s, const char *hints[],
     return 1;
 
   for (i = 0; i < nhints; i++) {
-    if (mutt_stristr (s, hints[i]) != NULL)
+    if (str_isstr (s, hints[i]) != NULL)
       return 1;
   }
 
@@ -740,7 +743,7 @@ static void pgpring_find_candidates (char *ringfile, const char *hints[],
     char *error_buf;
     size_t error_buf_len;
 
-    error_buf_len = sizeof ("fopen: ") - 1 + strlen (ringfile) + 1;
+    error_buf_len = sizeof ("fopen: ") - 1 + safe_strlen (ringfile) + 1;
     error_buf = safe_malloc (error_buf_len);
     snprintf (error_buf, error_buf_len, "fopen: %s", ringfile);
     perror (error_buf);