X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Ftrace-ir%2Fpacket.c;h=983887c42ebe1166cd5a8612cf48d7f2e8ad1799;hp=44a06fb0f77107273233d2a8647448412ed5828f;hb=238b7404b66983c6ba15c3a44bfbf642f20bdabe;hpb=140e6d943ff8f5657db28fbbe24ee8c98b7ca2f9

diff --git a/lib/trace-ir/packet.c b/lib/trace-ir/packet.c
index 44a06fb0..983887c4 100644
--- a/lib/trace-ir/packet.c
+++ b/lib/trace-ir/packet.c
@@ -218,6 +218,8 @@ void bt_packet_destroy(struct bt_packet *packet)
 		} else {
 			bt_field_wrapper_destroy(packet->header_field);
 		}
+
+		packet->header_field = NULL;
 	}
 
 	if (packet->context_field) {
@@ -228,20 +230,24 @@ void bt_packet_destroy(struct bt_packet *packet)
 		} else {
 			bt_field_wrapper_destroy(packet->context_field);
 		}
+
+		packet->context_field = NULL;
 	}
 
 	if (packet->default_beginning_cv) {
 		BT_LOGD_STR("Recycling beginning clock value.");
 		bt_clock_value_recycle(packet->default_beginning_cv);
+		packet->default_beginning_cv = NULL;
 	}
 
 	if (packet->default_end_cv) {
 		BT_LOGD_STR("Recycling end clock value.");
 		bt_clock_value_recycle(packet->default_end_cv);
+		packet->default_end_cv = NULL;
 	}
 
 	BT_LOGD_STR("Putting packet's stream.");
-	bt_object_put_ref(packet->stream);
+	BT_OBJECT_PUT_REF_AND_RESET(packet->stream);
 	g_free(packet);
 }