mhfixmsg.c: Fix memory leaks of boundary string on early returns.

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index cab759a40554ce271abe387463bd3a753bd2ceb6..6a7a048ea8f4514ac1f1525f21cf12a8ffcaa5b5 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -1742,8 +1742,7 @@ build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) {
                      boundary_in_content (&new_part->c_cefile.ce_fp,
                                           new_part->c_cefile.ce_file,
                                           boundary)) == NOTOK) {
                      boundary_in_content (&new_part->c_cefile.ce_fp,
                                           new_part->c_cefile.ce_file,
                                           boundary)) == NOTOK) {

-                    free_content (ct);
-                    return NULL;
+                    goto return_null;

                 }
             }
 
                 }
             }
 


@@ -1754,8 +1753,7 @@ build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) {
                      boundary_in_content (&new_part->c_fp,
                                           new_part->c_file,
                                           boundary)) == NOTOK) {
                      boundary_in_content (&new_part->c_fp,
                                           new_part->c_file,
                                           boundary)) == NOTOK) {

-                    free_content (ct);
-                    return NULL;
+                    goto return_null;

                 }
             }
 
                 }
             }
 


@@ -1775,8 +1773,7 @@ build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) {
 
         if (found_boundary) {
             inform("giving up trying to find a unique boundary");
 
         if (found_boundary) {
             inform("giving up trying to find a unique boundary");

-            free_content (ct);
-            return NULL;
+            goto return_null;

         }
     }
 
         }
     }
 


@@ -1821,6 +1818,11 @@ build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) {
     free (boundary);
 
     return ct;
     free (boundary);
 
     return ct;

+
+return_null:
+    free_content(ct);
+    free(boundary);
+    return NULL;

 }
 
 
 }