X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Factions%2Fpath.c;h=09cf08a4809d579224f697ccee1748e55256b5c0;hb=97535efaa975ca52bf02c2d5e76351bfd2e3defa;hp=7f4955475aa9775f9001e9a34aebca0e5b864874;hpb=cb9222ff73524b91bee4f968613a78340a727a04;p=lttng-tools.git

diff --git a/src/common/actions/path.c b/src/common/actions/path.c
index 7f4955475..09cf08a48 100644
--- a/src/common/actions/path.c
+++ b/src/common/actions/path.c
@@ -95,15 +95,14 @@ end:
 	return;
 }
 
-LTTNG_HIDDEN
 int lttng_action_path_copy(const struct lttng_action_path *src,
 		struct lttng_action_path *dst)
 {
 	int ret;
 	size_t i, src_count;
 
-	assert(src);
-	assert(dst);
+	LTTNG_ASSERT(src);
+	LTTNG_ASSERT(dst);
 
 	lttng_dynamic_array_init(&dst->indexes, sizeof(uint64_t), NULL);
 	src_count = lttng_dynamic_array_get_count(&src->indexes);
@@ -126,7 +125,6 @@ end:
 	return ret;
 }
 
-LTTNG_HIDDEN
 ssize_t lttng_action_path_create_from_payload(
 		struct lttng_payload_view *view,
 		struct lttng_action_path **_action_path)
@@ -143,6 +141,13 @@ ssize_t lttng_action_path_create_from_payload(
 
 	header = (typeof(header)) header_view.buffer.data;
 	consumed_size += header_view.buffer.size;
+
+	/*
+	 * An action path of size 0 can exist and represents a trigger with a
+	 * single non-list action. Handle it differently since a payload view of
+	 * size 0 is considered invalid.
+	 */
+	if (header->index_count != 0)
 	{
 		const struct lttng_payload_view indexes_view =
 				lttng_payload_view_from_view(view,
@@ -161,6 +166,11 @@ ssize_t lttng_action_path_create_from_payload(
 		if (!action_path) {
 			goto end;
 		}
+	} else {
+		action_path = lttng_action_path_create(NULL, 0);
+		if (!action_path) {
+			goto end;
+		}
 	}
 
 	ret = consumed_size;
@@ -169,7 +179,6 @@ end:
 	return ret;
 }
 
-LTTNG_HIDDEN
 int lttng_action_path_serialize(const struct lttng_action_path *action_path,
 		struct lttng_payload *payload)
 {