X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Flib%2Ferror.c;h=bd8259ab71057103385d75b711ffd59a5508007a;hp=9144bd96ddc528c9f52e47afe88d0c195bd678ed;hb=6ef39fe95fc5956397585fedb4424376b08d8d0e;hpb=ab3c863fc6611c7149232f93b755ac3cba9e038e

diff --git a/src/lib/error.c b/src/lib/error.c
index 9144bd96..bd8259ab 100644
--- a/src/lib/error.c
+++ b/src/lib/error.c
@@ -300,8 +300,10 @@ struct bt_error_cause_component_actor *create_error_cause_component_actor(
 	goto end;
 
 error:
-	destroy_error_cause(&cause->base);
-	cause = NULL;
+	if (cause) {
+		destroy_error_cause(&cause->base);
+		cause = NULL;
+	}
 
 end:
 	return cause;
@@ -341,8 +343,10 @@ create_error_cause_component_class_actor(struct bt_component_class *comp_cls,
 	goto end;
 
 error:
-	destroy_error_cause(&cause->base);
-	cause = NULL;
+	if (cause) {
+		destroy_error_cause(&cause->base);
+		cause = NULL;
+	}
 
 end:
 	return cause;
@@ -407,8 +411,10 @@ create_error_cause_message_iterator_actor(struct bt_message_iterator *iter,
 	goto end;
 
 error:
-	destroy_error_cause(&cause->base);
-	cause = NULL;
+	if (cause) {
+		destroy_error_cause(&cause->base);
+		cause = NULL;
+	}
 
 end:
 	return cause;
@@ -523,7 +529,10 @@ int bt_error_append_cause_from_component(
 	cause = NULL;
 
 end:
-	destroy_error_cause(&cause->base);
+	if (cause) {
+		destroy_error_cause(&cause->base);
+	}
+
 	return status;
 }
 
@@ -557,7 +566,10 @@ int bt_error_append_cause_from_component_class(
 	cause = NULL;
 
 end:
-	destroy_error_cause(&cause->base);
+	if (cause) {
+		destroy_error_cause(&cause->base);
+	}
+
 	return status;
 }
 
@@ -590,7 +602,10 @@ int bt_error_append_cause_from_message_iterator(
 	cause = NULL;
 
 end:
-	destroy_error_cause(&cause->base);
+	if (cause) {
+		destroy_error_cause(&cause->base);
+	}
+
 	return status;
 }