X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtp.c;h=b7da263ec3c1d5992beabebe0cbdff2d2b85f6b7;hb=b425dda0a48b4a3e24a9f22d25e864d42679feee;hp=304344694bdc16b4e96604453f4993d12293f821;hpb=8b8941a7c48dfcbec1f356150990da20093d6a16;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index 304344694..b7da263ec 100644
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -958,7 +958,7 @@ void smtp_try(const char *key, const char *addr, int *status,
 		if (!strncasecmp(buf, "From:", 5)) {
 			safestrncpy(mailfrom, &buf[5], sizeof mailfrom);
 			striplt(mailfrom);
-			for (i=0; i<strlen(mailfrom); ++i) {
+			for (i=0; !IsEmptyStr(&mailfrom[i]); ++i) {
 				if (!isprint(mailfrom[i])) {
 					strcpy(&mailfrom[i], &mailfrom[i+1]);
 					i=0;
@@ -968,7 +968,7 @@ void smtp_try(const char *key, const char *addr, int *status,
 			/* Strip out parenthesized names */
 			lp = (-1);
 			rp = (-1);
-			for (i=0; i<strlen(mailfrom); ++i) {
+			for (i=0; !IsEmptyStr(&mailfrom[i]); ++i) {
 				if (mailfrom[i] == '(') lp = i;
 				if (mailfrom[i] == ')') rp = i;
 			}
@@ -979,7 +979,7 @@ void smtp_try(const char *key, const char *addr, int *status,
 			/* Prefer brokketized names */
 			lp = (-1);
 			rp = (-1);
-			for (i=0; i<strlen(mailfrom); ++i) {
+			for (i=0; !IsEmptyStr(&mailfrom[i]); ++i) {
 				if (mailfrom[i] == '<') lp = i;
 				if (mailfrom[i] == '>') rp = i;
 			}