replace non-ascii chars in header values for messages that don't respect RFC2047

Author: jkbzh

src/parse.c

@@ -1087,6 +1087,9 @@ static char *mdecodeRFC2047(char *string, int length, char *charsetsave)
     }
     else {
 	free(storage);
+        /* make sure there are only ascii chars in the string
+        ** for messages that don't respect rfc2047 */
+        i18n_replace_non_ascii_chars(string);
 	return string;
     }
 }

src/proto.h

@@ -99,6 +99,7 @@ char *unobfuscate_email_address (char *);
 char *i18n_convstring(char *, char *, char *, size_t *);
 char *i18n_utf2numref(char *, int);
 unsigned char *i18n_numref2utf(char *);
+int i18n_replace_non_ascii_chars(char *);
 
 char *PushByte(struct Push *, char);
 char *PushString(struct Push *, const char *);

src/string.c

@@ -452,6 +452,25 @@ unsigned char *i18n_numref2utf(char *string){
   return headofutfstr;
 }
 
+/* replaces all non 7-bit ascii chars in string by a ? 
+** returns the number of replaced chars
+*/
+int i18n_replace_non_ascii_chars(char *string)
+{
+    char *ptr = string;
+    int count = 0;
+  
+    while (*ptr) {
+        if (!isascii(*ptr) || *ptr < 0x20) {
+            *ptr = '?';
+            count++;
+        }
+        ptr++;
+    }
+    
+    return count;
+}
+
 #endif
 /* end of I18N hack */