Fixed double fclose() in InitMultiPart() and leaks introduced in

commit 5be8db81.

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index ca1acf8..0c0a297 100644 (file)
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -407,6 +407,7 @@ three_print:
        putc ('\n', out);
 
     (*ct->c_ceclosefnx) (ct);
        putc ('\n', out);
 
     (*ct->c_ceclosefnx) (ct);

+    free (bufp);

     return OK;
 }
 
     return OK;
 }
 

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 0ec7712..7851e18 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -1179,7 +1179,6 @@ next_part:
            if (!(p = get_content (fp, ct->c_file,
                        ct->c_subtype == MULTI_DIGEST ? -1 : 0))) {
                free(bufp);
            if (!(p = get_content (fp, ct->c_file,
                        ct->c_subtype == MULTI_DIGEST ? -1 : 0))) {
                free(bufp);

-               fclose (ct->c_fp);

                ct->c_fp = NULL;
                return NOTOK;
            }
                ct->c_fp = NULL;
                return NOTOK;
            }


@@ -2127,6 +2126,7 @@ ready_to_go:
       fclose (ct->c_fp);
       ct->c_fp = NULL;
     }
       fclose (ct->c_fp);
       ct->c_fp = NULL;
     }

+    free (bufp);

     return fileno (ce->ce_fp);
 
 clean_up:
     return fileno (ce->ce_fp);
 
 clean_up:


@@ -2135,6 +2135,7 @@ clean_up:
       fclose (ct->c_fp);
       ct->c_fp = NULL;
     }
       fclose (ct->c_fp);
       ct->c_fp = NULL;
     }

+    free (bufp);

     return NOTOK;
 }
 
     return NOTOK;
 }
 


@@ -3550,6 +3551,7 @@ bad_quote:
                                "%s's %s: field\n%*s(parameter %s)", sp->index,
                                filename, fieldname, strlen(invo_name) + 2, "",
                                nameptr);
                                "%s's %s: field\n%*s(parameter %s)", sp->index,
                                filename, fieldname, strlen(invo_name) + 2, "",
                                nameptr);

+                       free (nameptr);

                        return NOTOK;
                    }
                    if (sp2->index < sp->index &&
                        return NOTOK;
                    }
                    if (sp2->index < sp->index &&


@@ -3565,6 +3567,7 @@ bad_quote:
                           "param in message %s's %s: field\n%*s(parameter %s)",
                           filename, fieldname, strlen(invo_name) + 2, "",
                           nameptr);
                           "param in message %s's %s: field\n%*s(parameter %s)",
                           filename, fieldname, strlen(invo_name) + 2, "",
                           nameptr);

+                   free (nameptr);

                    return NOTOK;
                }
            }
                    return NOTOK;
                }
            }