X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fspawn-viewer.c;h=52be70526e5309e6c1ee10acefef030bf9238c39;hb=3afa94aeca5a0daae40fd7b6cc96b7e4c150c7d8;hp=7818865035dd4eebdcee650b5cf9f7701198b8cc;hpb=edf4b93e2f5c849cbec49e987990b3705ea49f6a;p=lttng-tools.git

diff --git a/src/common/spawn-viewer.c b/src/common/spawn-viewer.c
index 781886503..52be70526 100644
--- a/src/common/spawn-viewer.c
+++ b/src/common/spawn-viewer.c
@@ -7,7 +7,6 @@
  *
  */
 
-#include <assert.h>
 #include <stdbool.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -69,7 +68,7 @@ static char **alloc_argv_from_user_opts(char *opts, const char *trace_path)
 {
 	int i = 0, ignore_space = 0;
 	unsigned int num_opts = 1;
-	char **argv, *token = opts;
+	char **argv, *token = opts, *saveptr = NULL;
 
 	/* Count number of arguments. */
 	do {
@@ -91,13 +90,13 @@ static char **alloc_argv_from_user_opts(char *opts, const char *trace_path)
 		goto error;
 	}
 
-	token = strtok(opts, " ");
+	token = strtok_r(opts, " ", &saveptr);
 	while (token != NULL) {
 		argv[i] = strdup(token);
 		if (argv[i] == NULL) {
 			goto error;
 		}
-		token = strtok(NULL, " ");
+		token = strtok_r(NULL, " ", &saveptr);
 		i++;
 	}
 
@@ -249,7 +248,7 @@ retry_viewer:
 	 * This function should never return if successfull because `execvp(3)`
 	 * onle returns if an error has occurred.
 	 */
-	assert(ret != 0);
+	LTTNG_ASSERT(ret != 0);
 error:
 	free(argv);
 	return ret;