changeset 350:f88b108b82b6

Add one free() and do a little fd cleanup
author mmj
date Tue, 09 Nov 2004 19:40:48 +1100
parents 3e5f41119b4a
children 370a584ade9d
files src/gethdrline.c src/mlmmj-process.c
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/gethdrline.c	Tue Nov 09 18:55:18 2004 +1100
+++ b/src/gethdrline.c	Tue Nov 09 19:40:48 2004 +1100
@@ -55,6 +55,7 @@
 		} else {
 			tmp = retstr;
 			retstr = concatstr(3, retstr, line, nextline);
+			myfree(line);
 			myfree(tmp);
 
 			return retstr;
--- a/src/mlmmj-process.c	Tue Nov 09 18:55:18 2004 +1100
+++ b/src/mlmmj-process.c	Tue Nov 09 19:40:48 2004 +1100
@@ -92,14 +92,15 @@
 	if((moderatorsfd = open(moderatorsfilename, O_RDONLY)) < 0) {
 		log_error(LOG_ARGS, "Could not open '%s'", moderatorsfilename);
 		myfree(moderatorsfilename);
-		close(queuefd);
+		close(moderatorfd);
 		exit(EXIT_FAILURE);
 	}
 	myfree(moderatorsfilename);
 
 	if((mailfd = open(mailfilename, O_RDONLY)) < 0) {
 		log_error(LOG_ARGS, "Could not open '%s'", mailfilename);
-		close(queuefd);
+		close(moderatorfd);
+		close(moderatorsfd);
 		exit(EXIT_FAILURE);
 	}
 
@@ -117,6 +118,9 @@
 	if(queuefd < 0) {
 		log_error(LOG_ARGS, "Could not open '%s'", queuefilename);
 		myfree(queuefilename);
+		close(moderatorfd);
+		close(moderatorsfd);
+		close(mailfd);
 		exit(EXIT_FAILURE);
 	}
 
@@ -484,9 +488,9 @@
 	close(rawmailfd);
 	close(donemailfd);
 
-	if(hdrfd)
+	if(hdrfd >= 0)
 		close(hdrfd);
-	if(footfd)
+	if(footfd >= 0)
 		close(footfd);
 
 	if(readhdrs[0].token) { /* From: addresses */