X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsession-descriptor.c;h=757a82a5d2414f45743127e379e0405ead17e9b7;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=6f0a357e3e04a25eee7173e08a31c5114e4eefa4;hpb=b178f53e90c376dd44b020535c32649edef8f80e;p=lttng-tools.git

diff --git a/src/common/session-descriptor.c b/src/common/session-descriptor.c
index 6f0a357e3..757a82a5d 100644
--- a/src/common/session-descriptor.c
+++ b/src/common/session-descriptor.c
@@ -1,18 +1,7 @@
 /*
- * Copyright (C) 2019 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2019 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * SPDX-License-Identifier: GPL-2.0-only
  */
 
 #include <lttng/session-descriptor-internal.h>
@@ -21,7 +10,6 @@
 #include <common/defaults.h>
 #include <common/error.h>
 #include <time.h>
-#include <assert.h>
 #include <stdio.h>
 
 struct lttng_session_descriptor_network_location {
@@ -522,6 +510,10 @@ _lttng_session_descriptor_live_network_create(
 
 	descriptor = _lttng_session_descriptor_live_create(name,
 			live_timer_interval_us);
+	if (!descriptor) {
+		goto error;
+	}
+
 	descriptor->base.output_type =
 			LTTNG_SESSION_DESCRIPTOR_OUTPUT_TYPE_NETWORK;
 
@@ -550,14 +542,8 @@ lttng_session_descriptor_live_create(
 	struct lttng_session_descriptor_live *descriptor;
 
 	descriptor = _lttng_session_descriptor_live_create(name, live_timer_us);
-	if (!descriptor) {
-		goto error;
-	}
 
 	return descriptor ? &descriptor->base : NULL;
-error:
-	lttng_session_descriptor_destroy(descriptor ? &descriptor->base : NULL);
-	return NULL;
 }
 
 struct lttng_session_descriptor *
@@ -629,12 +615,12 @@ ssize_t lttng_session_descriptor_create_from_buffer(
 
 	current_view = lttng_buffer_view_from_view(payload, offset,
 			sizeof(*base_header));
-	base_header = (typeof(base_header)) current_view.data;
-	if (!base_header) {
+	if (!lttng_buffer_view_is_valid(&current_view)) {
 		ret = -1;
 		goto end;
 	}
 
+	base_header = (typeof(base_header)) current_view.data;
 	switch (base_header->type) {
 	case LTTNG_SESSION_DESCRIPTOR_TYPE_REGULAR:
 	case LTTNG_SESSION_DESCRIPTOR_TYPE_SNAPSHOT:
@@ -645,12 +631,12 @@ ssize_t lttng_session_descriptor_create_from_buffer(
 
 		current_view = lttng_buffer_view_from_view(payload, offset,
 				sizeof(*live_header));
-		live_header = (typeof(live_header)) current_view.data;
-		if (!live_header) {
+		if (!lttng_buffer_view_is_valid(&current_view)) {
 			ret = -1;
 			goto end;
 		}
 
+		live_header = (typeof(live_header)) current_view.data;
 		live_timer_us = live_header->live_timer_us;
 		break;
 	}
@@ -687,12 +673,12 @@ ssize_t lttng_session_descriptor_create_from_buffer(
 	/* Map the name. */
 	current_view = lttng_buffer_view_from_view(payload, offset,
 			base_header->name_len);
-	name = current_view.data;
-	if (!name) {
+	if (!lttng_buffer_view_is_valid(&current_view)) {
 		ret = -1;
 		goto end;
 	}
 
+	name = current_view.data;
 	if (base_header->name_len == 1 ||
 			name[base_header->name_len - 1] ||
 			strlen(name) != base_header->name_len - 1) {
@@ -718,11 +704,12 @@ skip_name:
 		/* Map a URI. */
 		current_view = lttng_buffer_view_from_view(payload,
 				offset, sizeof(*uri));
-		uri = (typeof(uri)) current_view.data;
-		if (!uri) {
+		if (!lttng_buffer_view_is_valid(&current_view)) {
 			ret = -1;
 			goto end;
 		}
+
+		uri = (typeof(uri)) current_view.data;
 		uris[i] = zmalloc(sizeof(*uri));
 		if (!uris[i]) {
 			ret = -1;
@@ -1055,7 +1042,7 @@ enum lttng_error_code lttng_session_descriptor_set_default_output(
 				goto end;
 			}
 		}
-		assert(descriptor->name);
+		LTTNG_ASSERT(descriptor->name);
 		ret = snprintf(local_uri, sizeof(local_uri),
 				"file://%s/%s/%s%s",
 				absolute_home_path,