From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Mon, 17 Jul 2017 20:36:19 +0000 (-0400)
Subject: bt_notification_inactivity_create(): create an empty CC priority map when NULL
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7acb78a0de02171e22079eeb3e715e43cbbb131e;p=deliverable%2Fbabeltrace.git

bt_notification_inactivity_create(): create an empty CC priority map when NULL

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/lib/graph/notification/inactivity.c b/lib/graph/notification/inactivity.c
index fc1d8ad8b..bb9425cab 100644
--- a/lib/graph/notification/inactivity.c
+++ b/lib/graph/notification/inactivity.c
@@ -55,9 +55,15 @@ struct bt_notification *bt_notification_inactivity_create(
 	struct bt_notification_inactivity *notification;
 	struct bt_notification *ret_notif = NULL;
 
-	if (!cc_prio_map) {
-		BT_LOGW_STR("Invalid parameter: clock class priority map is NULL.");
-		goto error;
+	if (cc_prio_map) {
+		/* Function's reference, released at the end */
+		bt_get(cc_prio_map);
+	} else {
+		cc_prio_map = bt_clock_class_priority_map_create();
+		if (!cc_prio_map) {
+			BT_LOGE_STR("Cannot create empty clock class priority map.");
+			goto error;
+		}
 	}
 
 	BT_LOGD("Creating inactivity notification object: "
@@ -91,6 +97,7 @@ error:
 	BT_PUT(ret_notif);
 
 end:
+	bt_put(cc_prio_map);
 	return ret_notif;
 }