X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2e768e3cc0ce768373d3320eca4cdd08b8cf646a..e6917522:/uip/mhfree.c?ds=sidebyside

diff --git a/uip/mhfree.c b/uip/mhfree.c
index 83ed5366..f2726d0f 100644
--- a/uip/mhfree.c
+++ b/uip/mhfree.c
@@ -9,7 +9,6 @@
  */
 
 #include <h/mh.h>
-#include <errno.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 
@@ -31,6 +30,7 @@ static void free_text (CT);
 static void free_multi (CT);
 static void free_partial (CT);
 static void free_external (CT);
+static void free_pmlist (PM);
 
 
 /*
@@ -104,10 +104,13 @@ free_content (CT ct)
 	free (ct->c_descr);
     if (ct->c_dispo)
 	free (ct->c_dispo);
+    if (ct->c_dispo_type)
+	free (ct->c_dispo_type);
+    free_pmlist (ct->c_dispo_first);
 
     if (ct->c_file) {
 	if (ct->c_unlink)
-	    unlink (ct->c_file);
+	    (void) m_unlink (ct->c_file);
 	free (ct->c_file);
     }
     if (ct->c_fp)
@@ -151,7 +154,6 @@ free_header (CT ct)
 void
 free_ctinfo (CT ct)
 {
-    char **ap;
     CI ci;
 
     ci = &ct->c_ctinfo;
@@ -163,10 +165,7 @@ free_ctinfo (CT ct)
 	free (ci->ci_subtype);
 	ci->ci_subtype = NULL;
     }
-    for (ap = ci->ci_attrs; *ap; ap++) {
-	free (*ap);
-	*ap = NULL;
-    }
+    free_pmlist(ci->ci_first_pm);
     if (ci->ci_comment) {
 	free (ci->ci_comment);
 	ci->ci_comment = NULL;
@@ -246,12 +245,35 @@ free_external (CT ct)
     free_content (e->eb_content);
     if (e->eb_body)
 	free (e->eb_body);
+    if (e->eb_url)
+    	free (e->eb_url);
 
     free ((char *) e);
     ct->c_ctparams = NULL;
 }
 
 
+static void
+free_pmlist (PM pm)
+{
+    PM pm2;
+
+    while (pm != NULL) {
+    	if (pm->pm_name)
+	    free (pm->pm_name);
+    	if (pm->pm_value)
+	    free (pm->pm_value);
+    	if (pm->pm_charset)
+	    free (pm->pm_charset);
+    	if (pm->pm_lang)
+	    free (pm->pm_lang);
+	pm2 = pm->pm_next;
+	free(pm);
+	pm = pm2;
+    }
+}
+
+
 /*
  * Free data structures related to encoding/decoding
  * Content-Transfer-Encodings.
@@ -260,10 +282,7 @@ free_external (CT ct)
 void
 free_encoding (CT ct, int toplevel)
 {
-    CE ce;
-
-    if (!(ce = ct->c_cefile))
-	return;
+    CE ce = &ct->c_cefile;
 
     if (ce->ce_fp) {
 	fclose (ce->ce_fp);
@@ -272,15 +291,12 @@ free_encoding (CT ct, int toplevel)
 
     if (ce->ce_file) {
 	if (ce->ce_unlink)
-	    unlink (ce->ce_file);
+	    (void) m_unlink (ce->ce_file);
 	free (ce->ce_file);
 	ce->ce_file = NULL;
     }
 
-    if (toplevel) {
-	free ((char *) ce);
-	ct->c_cefile = NULL;
-    } else {
+    if (! toplevel) {
 	ct->c_ceopenfnx = NULL;
     }
 }