Index: src/libical/icaltimezone.c
===================================================================
--- src/libical/icaltimezone.c	(revision 935)
+++ src/libical/icaltimezone.c	(working copy)
@@ -1354,6 +1354,7 @@
 icaltimezone_free_builtin_timezones(void)
 {
 	icaltimezone_array_free(builtin_timezones);
+	builtin_timezones = 0;
 }
 
 
Index: src/libical/icalarray.c
===================================================================
--- src/libical/icalarray.c	(revision 935)
+++ src/libical/icalarray.c	(working copy)
@@ -72,9 +72,12 @@
 void
 icalarray_free			(icalarray	*array)
 {
-    if (array->data)
+    if (array->data) {
 	free (array->data);
+	array->data = 0;
+    }
     free (array);
+    array = 0;
 }
 
 
@@ -152,7 +155,10 @@
 
     if (new_data) {
 	memcpy(new_data,array->data,array->element_size*array->space_allocated);
-	free(array->data);
+	if (array->data) {
+	    free(array->data);
+	    array->data = 0;
+	}
 	array->data = new_data;
 	array->space_allocated = new_space_allocated;
     } else {
Index: src/libical/icalvalue.c
===================================================================
--- src/libical/icalvalue.c	(revision 935)
+++ src/libical/icalvalue.c	(working copy)
@@ -697,7 +697,6 @@
     }
 
     switch (v->kind){
-	case ICAL_BINARY_VALUE: 
 	case ICAL_ATTACH_VALUE: {
 	    if (v->data.v_attach) {
 		icalattach_unref (v->data.v_attach);
@@ -706,6 +705,7 @@
 
 	    break;
 	}
+	case ICAL_BINARY_VALUE: 
 	case ICAL_TEXT_VALUE:
 	case ICAL_CALADDRESS_VALUE:
 	case ICAL_URI_VALUE:
Index: src/libicalvcal/icalvcal.c
===================================================================
--- src/libicalvcal/icalvcal.c	(revision 935)
+++ src/libicalvcal/icalvcal.c	(working copy)
@@ -360,6 +360,7 @@
 		attach = icalattach_new_from_url (s);
 		attach_prop = icalproperty_new_attach (attach);
 		icalcomponent_add_property (comp, attach_prop);
+		icalattach_unref(attach);
 
 		/* We output a "application/binary" FMTTYPE for Procedure
 		   alarms. */
@@ -471,6 +472,7 @@
 
 		fmttype_param = icalparameter_new_fmttype (defaults->alarm_audio_fmttype);
 		icalproperty_add_parameter (attach_prop, fmttype_param);
+		icalattach_unref(attach);
 	    } else {
 	        is_valid_alarm = 0;
 	    }
@@ -544,6 +546,7 @@
 		free (new_url);
 
 		icalproperty_set_attach (attach_prop, new_attach);
+		icalattach_unref(attach);
 
 	    } else {
 		is_valid_alarm = 0;