spamify_replacedomain: another fix for greedy "@" replacement in the

middle of a string of iso-2022-jp encoded Japanese characters.

Author: jkbzh

Changelog

@@ -4,6 +4,11 @@ Version Changes for Hypermail
 HYPERMAIL VERSION 2.4.0:
 ============================
 
+2018-11-29 Bill Shannon
+	* string.c
+	spamify_replacedomain: another fix for greedy "@" replacement in the
+	middle of a string of iso-2022-jp encoded Japanese characters.
+
 2018-11-04 Bill Shannon
 	* string.c
 	i18n_convstring(): When converting a utf-8 string to iso-2022-jp,

src/getname.c

@@ -52,35 +52,35 @@ char *spamify_small(char *input)
 
 char *spamify_replacedomain(char *input, char *antispamdomain)
 {
-    /* replace everything after the @-letter in the email address */
-    int newlen = strlen(input) + strlen(set_antispam_at);
-    int domainlen = strlen(antispamdomain);
-
     char *atptr = strchr(input, '@');
+    
+    if (atptr) {
+	/* replace everything after the @-letter in the email address */
+	int domainlen = strlen(antispamdomain);
+	struct Push buff;
+	int in_ascii = TRUE, esclen = 0;
 
-    if (domainlen > 0) {
-        newlen = newlen + domainlen;
-    }
+	INIT_PUSH(buff);
 
-    if (atptr) {
-        char *newbuf = malloc(newlen);
-        int index    = atptr - input;
-        /* copy the part before the @ */
-        memcpy(newbuf, input, index);
-        /* append _at_ */
-        memcpy(newbuf + index, set_antispam_at, strlen(set_antispam_at));
-        if (domainlen > 0) {
-            /* append the new domain */
-            strcpy(newbuf + index + strlen(set_antispam_at), antispamdomain);
-        }
-        else {
-            /* append the part after the @ */
-            strcpy(newbuf + index + strlen(set_antispam_at), input + index + 1);
-        }
-        /* correct the pointer and free the old */
-        free(input);
-        return newbuf;
+	for (; *input; input++) {
+	    if (set_iso2022jp) {
+                iso2022_state(input, &in_ascii, &esclen);
+            }
+	    if (in_ascii == TRUE && *input == '@') {
+		PushString(&buff, set_antispam_at);
+		if (domainlen > 0) {
+		    /* append the new domain */
+		    PushString(&buff, antispamdomain);
+		    break;
+		}
+	    }
+	    else {
+		PushByte(&buff, *input);
+            }
+	}
+	RETURN_PUSH(buff);
     }
+    
     /* weird email, bail out */
     return input;
 }
@@ -252,9 +252,9 @@ void getname(char *line, char **namep, char **emailp)
             char *c2 = strchr(line, '>');
             if (c2 != NULL) {
                 c = c2 + 1;
-                for (i = 0, len = NAMESTRLEN - 1; *c && *c != '\n' && i < len; c++)
+                for (i = 0, len = NAMESTRLEN - 1; *c && *c != '\n' && i < len; c++) {
                     name[i++] = *c;
-
+		}
                 comment_fnd = 1;
             }
         }