X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent-class.c;h=538cd77be1daff6a254ee80bffd03cf3ac087c6d;hb=a29c5be9faf8b3bb7d82ae16264c8f4d919a418a;hp=dcdd8e7dd8b4aa46c4c4fa6dbcc186dabd20136b;hpb=1778c2a4134647150b199b2b57130817144446b0;p=babeltrace.git

diff --git a/src/lib/graph/component-class.c b/src/lib/graph/component-class.c
index dcdd8e7d..538cd77b 100644
--- a/src/lib/graph/component-class.c
+++ b/src/lib/graph/component-class.c
@@ -36,15 +36,17 @@ void destroy_component_class(struct bt_object *obj)
 	BT_LIB_LOGI("Destroying component class: %!+C", class);
 
 	/* Call destroy listeners in reverse registration order */
-	for (i = class->destroy_listeners->len - 1; i >= 0; i--) {
-		struct bt_component_class_destroy_listener *listener =
-			&g_array_index(class->destroy_listeners,
-				struct bt_component_class_destroy_listener,
-				i);
-
-		BT_LOGD("Calling destroy listener: func-addr=%p, data-addr=%p",
-			listener->func, listener->data);
-		listener->func(class, listener->data);
+	if (class->destroy_listeners) {
+		for (i = class->destroy_listeners->len - 1; i >= 0; i--) {
+			struct bt_component_class_destroy_listener *listener =
+				&g_array_index(class->destroy_listeners,
+					struct bt_component_class_destroy_listener,
+					i);
+
+			BT_LOGD("Calling destroy listener: func-addr=%p, data-addr=%p",
+				listener->func, listener->data);
+			listener->func(class, listener->data);
+		}
 	}
 
 	if (class->name) {
@@ -540,7 +542,7 @@ bt_component_class_set_description(
 		"addr=%p, name=\"%s\", type=%s",
 		comp_cls,
 		bt_component_class_get_name(comp_cls),
-		bt_component_class_type_string(comp_cls->type));
+		bt_common_component_class_type_string(comp_cls->type));
 	return BT_FUNC_STATUS_OK;
 }