X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsnapshot.c;h=c4c3bf1f8c13d9f0433a57d61461568304a83523;hp=898f77af98f1c463c3682757ef278acbd7da97d2;hb=f4cc5e83435948e64f5c7bce395ca19703da02a3;hpb=6addfa379ee608b20cfe5e15d135bcb6a9724e90

diff --git a/src/bin/lttng-sessiond/snapshot.c b/src/bin/lttng-sessiond/snapshot.c
index 898f77af9..c4c3bf1f8 100644
--- a/src/bin/lttng-sessiond/snapshot.c
+++ b/src/bin/lttng-sessiond/snapshot.c
@@ -15,7 +15,6 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <assert.h>
 #include <inttypes.h>
@@ -63,7 +62,10 @@ static int output_init(uint64_t max_size, const char *name,
 	lttng_ht_node_init_ulong(&output->node, (unsigned long) output->id);
 
 	if (name && name[0] != '\0') {
-		strncpy(output->name, name, sizeof(output->name));
+		if (lttng_strncpy(output->name, name, sizeof(output->name))) {
+			ret = -LTTNG_ERR_INVALID;
+			goto error;
+		}
 	} else {
 		/* Set default name. */
 		ret = snprintf(output->name, sizeof(output->name), "%s-%" PRIu32,
@@ -92,10 +94,14 @@ static int output_init(uint64_t max_size, const char *name,
 	}
 
 	if (uris[0].dtype == LTTNG_DST_PATH) {
-		memset(output->consumer->dst.trace_path, 0,
-				sizeof(output->consumer->dst.trace_path));
-		strncpy(output->consumer->dst.trace_path, uris[0].dst.path,
-				sizeof(output->consumer->dst.trace_path));
+		memset(output->consumer->dst.session_root_path, 0,
+				sizeof(output->consumer->dst.session_root_path));
+		if (lttng_strncpy(output->consumer->dst.session_root_path,
+				uris[0].dst.path,
+				sizeof(output->consumer->dst.session_root_path))) {
+			ret = -LTTNG_ERR_INVALID;
+			goto error;
+		}
 		output->consumer->type = CONSUMER_DST_LOCAL;
 		ret = 0;
 		goto end;
@@ -315,7 +321,9 @@ void snapshot_destroy(struct snapshot *obj)
 	struct lttng_ht_iter iter;
 	struct snapshot_output *output;
 
-	assert(obj);
+	if (!obj->output_ht) {
+		return;
+	}
 
 	rcu_read_lock();
 	cds_lfht_for_each_entry(obj->output_ht->ht, &iter.iter, output,