Fix FILE resource leaks in uip/distsbr.c

[mmh] / uip / distsbr.c

diff --git a/uip/distsbr.c b/uip/distsbr.c
index 21b42a5..2662c02 100644 (file)
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -25,7 +25,7 @@ int
 distout(char *drft, char *msgnam, char *backup)
 {
        enum state state;
-       struct field f = free_field;
+       struct field f = {{0}};
        unsigned char *dp;
        int resent = 0;
        FILE *ifp, *ofp;
@@ -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);
 
@@ -123,7 +126,7 @@ static int
 ready_msg(char *msgnam)
 {
        enum state state;
-       struct field f = free_field;
+       struct field f = {{0}};
        char tmpfil[BUFSIZ];
        int out;
        FILE *ifp, *ofp;
@@ -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;
        }
@@ -182,10 +187,10 @@ ready_msg(char *msgnam)
                                return NOTOK;
                        }
                        unlink(tmpfil);
-                       fprintf(ofp, "\n%s", f.value);
+                       fputs("\n", ofp);
                        while (state == BODY2) {
-                               state = m_getfld2(state, &f, ifp);
                                fputs(f.value, ofp);
+                               state = m_getfld2(state, &f, ifp);
                        }
                        /* FALL */