make scan_content() work correctly with content containing NULs

[nmh] / sbr / utils.c

diff --git a/sbr/utils.c b/sbr/utils.c
index 99207e3258092c70d1d953362b067faeca140f40..4405f4c95a5c52d5cf406d52cc95535479b71781 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -353,6 +353,20 @@ nmh_init(const char *argv0, int read_context) {
     }
 }
 
+
+/* Returns copy of argument str with all characters converted to upper
+   case, and trimmed whitespace (see cpytrim()) . */
+char *
+upcase (const char *str) {
+    char *up = cpytrim (str);
+    char *cp;
+
+    for (cp = up; *cp; ++cp) { *cp = toupper ((unsigned char) *cp); }
+
+    return up;
+}
+
+
 /*
  * Scan for any 8-bit characters.  Return 1 if they exist.
  *
@@ -363,6 +377,9 @@ nmh_init(const char *argv0, int read_context) {
 int
 contains8bit(const char *start, const char *end)
 {
+    if (! start)
+       return 0;
+
     while (*start != '\0' && (!end || (start < end)))
        if (! isascii((unsigned char) *start++))
            return 1;