X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=lib%2Ftrace-ir%2Ffield-wrapper.c;h=6d02b757df7685db01f561dc41bde16494dfe544;hb=35fa110e5bea4a35497313adf3e3d0fa09db9ff7;hp=ed50537abc03b6ec1c1220cb80a112632677d543;hpb=939190b374e61ac2a31e38ecc6c31f2f986690ab;p=babeltrace.git

diff --git a/lib/trace-ir/field-wrapper.c b/lib/trace-ir/field-wrapper.c
index ed50537a..6d02b757 100644
--- a/lib/trace-ir/field-wrapper.c
+++ b/lib/trace-ir/field-wrapper.c
@@ -24,7 +24,7 @@
 #include <babeltrace/lib-logging-internal.h>
 
 #include <babeltrace/trace-ir/field-wrapper-internal.h>
-#include <babeltrace/trace-ir/fields-internal.h>
+#include <babeltrace/trace-ir/field-internal.h>
 #include <babeltrace/object-pool-internal.h>
 #include <babeltrace/object-internal.h>
 #include <glib.h>
@@ -58,6 +58,7 @@ void bt_field_wrapper_destroy(struct bt_field_wrapper *field_wrapper)
 	if (field_wrapper->field) {
 		BT_LOGD_STR("Destroying field.");
 		bt_field_destroy((void *) field_wrapper->field);
+		field_wrapper->field = NULL;
 	}
 
 	BT_LOGD_STR("Putting stream class.");
@@ -82,7 +83,7 @@ struct bt_field_wrapper *bt_field_wrapper_create(
 	if (!field_wrapper->field) {
 		field_wrapper->field = (void *) bt_field_create(fc);
 		if (!field_wrapper->field) {
-			BT_LIB_LOGE("Cannot create field wrapper from field classe: "
+			BT_LIB_LOGE("Cannot create field wrapper from field class: "
 				"%![fc-]+F", fc);
 			goto error;
 		}