X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=uip%2Fmhparse.c;fp=uip%2Fmhparse.c;h=f04a3482017a0d5fced7a45d7ea6424921f4d852;hb=d4c34b4439a9dbd89664de460ed37ecddc260fb1;hp=d3f543fb581326cd336f5254783831cc85adef7c;hpb=b78007de9802005825390bee71dfce2306b42519;p=mmh

diff --git a/uip/mhparse.c b/uip/mhparse.c
index d3f543f..f04a348 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -536,18 +536,18 @@ incl_name_value(unsigned char *buf, char *name, char *value) {
 				*cp = '\0';
 				newbuf = concat(prefix, insertion, suffix,
 						"\n", NULL);
-				free(suffix);
+				mh_free0(&suffix);
 			} else {
 				/* Append to end. */
 				newbuf = concat(buf, insertion, "\n", NULL);
 			}
 
-			free(prefix);
-			free(insertion);
-			free(buf);
+			mh_free0(&prefix);
+			mh_free0(&insertion);
+			mh_free0(&buf);
 		}
 
-		free(name_plus_equal);
+		mh_free0(&name_plus_equal);
 	}
 
 	return newbuf;
@@ -565,7 +565,7 @@ extract_name_value(char *name_suffix, char *value) {
 	char *name_suffix_equals = strstr(value, name_suffix_plus_quote);
 	char *cp;
 
-	free(name_suffix_plus_quote);
+	mh_free0(&name_suffix_plus_quote);
 	if (name_suffix_equals) {
 		char *name_suffix_begin;
 
@@ -777,8 +777,7 @@ bad_quote:
 	*/
 	if (magic && *cp == '<') {
 		if (ct->c_id) {
-			free(ct->c_id);
-			ct->c_id = NULL;
+			mh_free0(&(ct->c_id));
 		}
 		if (!(dp = strchr(ct->c_id = ++cp, '>'))) {
 			advise(NULL, "invalid ID in message %s", ct->c_file);
@@ -925,7 +924,7 @@ invalid:
 	if (istype) {
 		if ((dp = ci->ci_comment)) {
 			ci->ci_comment = concat(dp, " ", buffer, NULL);
-			free(dp);
+			mh_free0(&dp);
 		} else {
 			ci->ci_comment = getcpy(buffer);
 		}
@@ -1143,7 +1142,7 @@ end_part:
 				continue;
 			*next = NULL;
 			free_content(p);
-			free((char *) part);
+			mh_free0(&part);
 		}
 	}
 
@@ -1232,7 +1231,7 @@ reverse_parts(CT ct)
 	*next = NULL;
 
 	/* free array of pointers */
-	free((char *) base);
+	mh_free0(&base);
 }
 
 
@@ -1541,7 +1540,7 @@ openBase64(CT ct, char **file)
 				adios(EX_IOERR, ce->ce_file, "unable to rename %s to ",
 						file_org);
 			}
-			free(file_org);
+			mh_free0(&file_org);
 
 		} else {
 			ce->ce_file = add(cp, ce->ce_file);
@@ -1752,7 +1751,7 @@ openQuoted(CT ct, char **file)
 				adios(EX_IOERR, ce->ce_file, "unable to rename %s to ",
 						file_org);
 			}
-			free(file_org);
+			mh_free0(&file_org);
 
 		} else {
 			ce->ce_file = add(cp, ce->ce_file);
@@ -1969,7 +1968,7 @@ open7Bit(CT ct, char **file)
 				adios(EX_IOERR, ce->ce_file, "unable to rename %s to ",
 						file_org);
 			}
-			free(file_org);
+			mh_free0(&file_org);
 
 		} else {
 			ce->ce_file = add(cp, ce->ce_file);