From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Fri, 3 Feb 2017 01:37:27 +0000 (-0500)
Subject: Fix: only serialize a field if it is set
X-Git-Tag: v2.0.0-pre1~520
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=fa21dcb1bff5d533307b163da8d0d8057e61dba4

Fix: only serialize a field if it is set

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

diff --git a/formats/ctf/ir/fields.c b/formats/ctf/ir/fields.c
index f5b69784..0ad52a02 100644
--- a/formats/ctf/ir/fields.c
+++ b/formats/ctf/ir/fields.c
@@ -1903,6 +1903,10 @@ int bt_ctf_field_integer_serialize(struct bt_ctf_field *field,
 	struct bt_ctf_field_integer *integer = container_of(field,
 		struct bt_ctf_field_integer, parent);
 
+	if (!bt_ctf_field_generic_is_set(field)) {
+		ret = -1;
+		goto end;
+	}
 retry:
 	ret = ctf_integer_write(&pos->parent, &integer->definition.p);
 	if (ret == -EFAULT) {
@@ -1938,6 +1942,10 @@ int bt_ctf_field_floating_point_serialize(struct bt_ctf_field *field,
 	struct bt_ctf_field_floating_point *floating_point = container_of(field,
 		struct bt_ctf_field_floating_point, parent);
 
+	if (!bt_ctf_field_generic_is_set(field)) {
+		ret = -1;
+		goto end;
+	}
 retry:
 	ret = ctf_float_write(&pos->parent, &floating_point->definition.p);
 	if (ret == -EFAULT) {