From: Dmitry Bogatov <KAction@gnu.org>
Date: Sat, 27 Aug 2016 08:37:28 +0000 (+0300)
Subject: Fix FILE resource leaks in uip/distsbr.c
X-Git-Tag: mmh-0.4~75
X-Git-Url: http://git.marmaro.de/?p=mmh;a=commitdiff_plain;h=3ba0e8cc826b51f7d8e2d1e3e04557857d13f334;ds=sidebyside

Fix FILE resource leaks in uip/distsbr.c
---

diff --git a/uip/distsbr.c b/uip/distsbr.c
index 058875c..2662c02 100644
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -35,20 +35,23 @@ distout(char *drft, char *msgnam, char *backup)
 		advise(backup, "unable to rename %s to",drft);
 		return NOTOK;
 	}
+
+	if (ready_msg(msgnam) != OK) {
+		return NOTOK;
+	}
+
 	if (!(ifp = fopen(backup, "r"))) {
 		advise(backup, "unable to read");
 		return NOTOK;
 	}
 
 	if (!(ofp = fopen(drft, "w"))) {
+		fclose(ifp);
 		advise(drft, "unable to create temporary file");
 		return NOTOK;
 	}
 	chmod(drft, m_gmprot());
 
-	if (ready_msg(msgnam) != OK) {
-		return NOTOK;
-	}
 	lseek(hdrfd, (off_t) 0, SEEK_SET); /* msgnam not accurate */
 	cpydata(hdrfd, fileno(ofp), msgnam, drft);
 
@@ -144,12 +147,14 @@ ready_msg(char *msgnam)
 
 	cp = m_mktemp2(NULL, "dist", &hdrfd, NULL);
 	if (!cp) {
+		fclose(ifp);
 		advise("distsbr", "unable to create temporary file");
 		return NOTOK;
 	}
 	fchmod(hdrfd, 0600);
 	strncpy(tmpfil, cp, sizeof(tmpfil));
 	if ((out = dup(hdrfd)) == NOTOK || !(ofp = fdopen(out, "w"))) {
+		fclose(ifp);
 		advise(NULL, "no file descriptors -- you lose big");
 		return NOTOK;
 	}