X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fview.c;h=a8dcdd11f468d086d8e0ded84f0a308f3fa074fe;hb=6dd26587e926671cdec2545b7d3db74cbd6a7cd8;hp=faca60de8b980adfe60afcb2ac68a7c202a65595;hpb=68c7f6e55254fd6e54d7bb4a6c1316bb77843a6e;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/view.c b/src/bin/lttng/commands/view.c
index faca60de8..a8dcdd11f 100644
--- a/src/bin/lttng/commands/view.c
+++ b/src/bin/lttng/commands/view.c
@@ -30,7 +30,6 @@ static char *opt_session_name;
 static char *opt_viewer;
 static char *opt_trace_path;
 static const char *babeltrace_bin = CONFIG_BABELTRACE_BIN;
-//static const char *lttv_gui_bin = CONFIG_LTTV_GUI_BIN;
 
 #ifdef LTTNG_EMBED_HELP
 static const char help_msg[] =
@@ -56,7 +55,6 @@ static struct poptOption long_options[] = {
  * This is needed for each viewer since we are using execvp().
  */
 static const char *babeltrace_opts[] = { "babeltrace" };
-//static const char *lttv_gui_opts[] = { "lttv-gui", "-t", };
 
 /*
  * Type is also use as the index in the viewers array. So please, make sure
@@ -64,8 +62,7 @@ static const char *babeltrace_opts[] = { "babeltrace" };
  */
 enum viewer_type {
 	VIEWER_BABELTRACE    = 0,
-	VIEWER_LTTV_GUI      = 1,
-	VIEWER_USER_DEFINED  = 2,
+	VIEWER_USER_DEFINED  = 1,
 };
 
 /*
@@ -77,7 +74,6 @@ static struct viewers {
 	enum viewer_type type;
 } viewers[] = {
 	{ "babeltrace", VIEWER_BABELTRACE },
-	{ "lttv-gui", VIEWER_LTTV_GUI },
 	{ NULL, VIEWER_USER_DEFINED },
 };
 
@@ -188,7 +184,7 @@ static char **alloc_argv_from_local_opts(const char **opts, size_t opts_len,
 		goto error;
 	}
 
-	memcpy(argv, opts, size);
+	memcpy(argv, opts, sizeof(char *) * opts_len);
 
 	if (session_live_mode) {
 		argv[opts_len] = "-i";
@@ -302,6 +298,7 @@ static int view_trace(void)
 	int ret;
 	char *session_name, *trace_path = NULL;
 	struct lttng_session *sessions = NULL;
+	bool free_trace_path = false;
 
 	/*
 	 * Safety net. If lttng is suid at some point for *any* useless reasons,
@@ -379,6 +376,7 @@ static int view_trace(void)
 				ret = CMD_ERROR;
 				goto free_sessions;
 			}
+			free_trace_path = true;
 		} else {
 			/* Get file system session path. */
 			trace_path = sessions[i].path;
@@ -396,7 +394,7 @@ static int view_trace(void)
 	}
 
 free_sessions:
-	if (session_live_mode) {
+	if (session_live_mode && free_trace_path) {
 		free(trace_path);
 	}
 	free(sessions);