X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ftracker.c;h=1c50d9d7911b8fcd2a410f55893b48669f48640a;hp=c27d9765562e590241e2ae9ba5ece15e8bbdc1a0;hb=3e6e0df2f8f9f23d252c2508b6d741916dfcc4b3;hpb=d4e3717311122d9def6e4edbebae32ab6fd06507

diff --git a/src/common/tracker.c b/src/common/tracker.c
index c27d97655..1c50d9d79 100644
--- a/src/common/tracker.c
+++ b/src/common/tracker.c
@@ -85,6 +85,7 @@ enum lttng_error_code process_attr_value_from_comm(
 		name = strdup(value_view->data);
 		if (!name) {
 			ret = LTTNG_ERR_NOMEM;
+			goto error;
 		}
 	}
 
@@ -102,10 +103,12 @@ enum lttng_error_code process_attr_value_from_comm(
 	}
 
 	/* Only expect a payload for name value types. */
-	if (is_value_type_name(value_type) && value_view->size == 0) {
+	if (is_value_type_name(value_type) &&
+			(!value_view || value_view->size == 0)) {
 		ret = LTTNG_ERR_INVALID_PROTOCOL;
 		goto error;
-	} else if (!is_value_type_name(value_type) && value_view->size != 0) {
+	} else if (!is_value_type_name(value_type) && value_view &&
+			value_view->size != 0) {
 		ret = LTTNG_ERR_INVALID_PROTOCOL;
 		goto error;
 	}
@@ -342,9 +345,10 @@ ssize_t lttng_process_attr_values_create_from_buffer(
 
 	header_view = lttng_buffer_view_from_view(
 			buffer_view, 0, sizeof(*header));
-	if (!header_view.data) {
+	if (!lttng_buffer_view_is_valid(&header_view)) {
 		goto error;
 	}
+
 	offset = header_view.size;
 	header = (typeof(header)) header_view.data;
 
@@ -367,7 +371,7 @@ ssize_t lttng_process_attr_values_create_from_buffer(
 
 		value_view = lttng_buffer_view_from_view(
 				buffer_view, offset, sizeof(*value_comm));
-		if (!value_view.data) {
+		if (!lttng_buffer_view_is_valid(&value_view)) {
 			goto error;
 		}
 
@@ -379,8 +383,13 @@ ssize_t lttng_process_attr_values_create_from_buffer(
 			value_name_view = lttng_buffer_view_from_view(
 					buffer_view, offset,
 					value_comm->value.name_len);
+			if (!lttng_buffer_view_is_valid(&value_name_view)) {
+				goto error;
+			}
+
 			offset += value_name_view.size;
 		}
+
 		ret_code = process_attr_value_from_comm(domain, process_attr,
 				type, &value_comm->value.integral,
 				&value_name_view, &value);