X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fnew.c;h=25ee492b5d3113ef099c72623e4bee00f86d9b4d;hb=d4c34b4439a9dbd89664de460ed37ecddc260fb1;hp=cb16dea29d4475af23dd2158309fc4eea0a68dde;hpb=4dc39c08f07428ff5f39acd7b0ddee30e0a004f6;p=mmh

diff --git a/uip/new.c b/uip/new.c
index cb16dea..25ee492 100644
--- a/uip/new.c
+++ b/uip/new.c
@@ -68,7 +68,7 @@ count_messages(char *field)
 		}
 	}
 
-	free(field);
+	mh_free0(&field);
 
 	return total;
 }
@@ -134,11 +134,11 @@ get_msgnums(char *folder, char *sequences[])
 					} else {
 						old_msgnums = msgnums;
 						msgnums = concat(old_msgnums, " ", this_msgnums, (void *)NULL);
-						free(old_msgnums);
-						free(this_msgnums);
+						mh_free0(&old_msgnums);
+						mh_free0(&this_msgnums);
 					}
 				}
-				free(cp);
+				mh_free0(&cp);
 			} else {
 				/* and here */
 				if (seq_in_list(name, sequences)) {
@@ -148,8 +148,8 @@ get_msgnums(char *folder, char *sequences[])
 					} else {
 						old_msgnums = msgnums;
 						msgnums = concat(old_msgnums, " ", this_msgnums, (void *)NULL);
-						free(old_msgnums);
-						free(this_msgnums);
+						mh_free0(&old_msgnums);
+						mh_free0(&this_msgnums);
 					}
 				}
 			}
@@ -187,9 +187,9 @@ check_folder(char *folder, size_t len, struct list_state *b)
 
 	if (is_cur || msgnums != NULL) {
 		if (*b->first == NULL) {
-			*b->first = b->node = mh_xmalloc(sizeof(*b->node));
+			*b->first = b->node = mh_xcalloc(1, sizeof(*b->node));
 		} else {
-			b->node->n_next = mh_xmalloc(sizeof(*b->node));
+			b->node->n_next = mh_xcalloc(1, sizeof(*b->node));
 			b->node = b->node->n_next;
 		}
 		b->node->n_name = folder;
@@ -280,7 +280,7 @@ join_sequences(char *sequences[])
 	for (i = 0; sequences[i] != NULL; i++) {
 		len += strlen(sequences[i]) + 1;
 	}
-	result = mh_xmalloc(len + 1);
+	result = mh_xcalloc(len + 1, sizeof(char));
 
 	for (i = 0, cp = result; sequences[i] != NULL; i++, cp += len + 1) {
 		len = strlen(sequences[i]);