From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 24 Oct 2022 10:04:05 +0000 (+0200)
Subject: mlmmj-send: validate values loaded from config files
X-Git-Tag: RELEASE_1_4_0a1~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=601904be97131085529f2e001cd21de18e0ea8ae;p=thirdparty%2Fmlmmj.git

mlmmj-send: validate values loaded from config files
---

diff --git a/src/mlmmj-send.c b/src/mlmmj-send.c
index a81c432b..3460ea6a 100644
--- a/src/mlmmj-send.c
+++ b/src/mlmmj-send.c
@@ -813,16 +813,16 @@ int main(int argc, char **argv)
 	char *subddirname = NULL, *listdir = NULL;
 	char listctrl = 0;
 	char *mlmmjbounce = NULL, *bindir, *mailmap, *probefile, *a;
-	char *body = NULL, *hdrs = NULL, *memmailsizestr = NULL, *verp = NULL;
-	char *listname, *listfqdn, *verpfrom, *maxverprecipsstr;
-	char strindex[32], *reply, *strport, *smtphelo, *requeuefilename;
+	char *body = NULL, *hdrs = NULL, *verp = NULL;
+	char *listname, *listfqdn, *verpfrom;
+	char strindex[32], *reply, *smtphelo, *requeuefilename;
 	ssize_t memmailsize = 0;
 	DIR *subddir;
 	struct dirent *dp;
 	struct stat st;
 	uid_t uid;
 	struct strlist stl;
-	unsigned short smtpport = 25;
+	unsigned short smtpport;
 	struct sigaction sigact;
 
 	CHECKFULLPATH(argv[0]);
@@ -951,15 +951,8 @@ int main(int argc, char **argv)
 		exit(EXIT_FAILURE);
 	}
 
-	memmailsizestr = ctrlvalue(listdir, "memorymailsize");
+	memmailsize = ctrlsizet(listdir, "memorymailsize", MEMORYMAILSIZE);
 	ctrlarchive = statctrl(listdir, "noarchive");
-	if(memmailsizestr) {
-		memmailsize = strtol(memmailsizestr, NULL, 10);
-		free(memmailsizestr);
-	}
-
-	if(memmailsize == 0)
-		memmailsize = MEMORYMAILSIZE;
 
 	if(st.st_size > memmailsize) {
 		prepmailinmem = 0;
@@ -1051,10 +1044,7 @@ int main(int argc, char **argv)
 	if(!relayhost)
 		relayhost = xstrdup(RELAYHOST);
 
-	strport = ctrlvalue(listdir, "smtpport");
-	if(strport)
-		smtpport = (unsigned short)atol(strport);
-
+	smtpport = ctrlushort(listdir, "smtpport", 25);
 	if ((smtphelo = ctrlvalue(listdir, "smtphelo")) == NULL) {
 		smtphelo = hostnamestr();
 	}