Fix: only free trace_path when it is dynamically allocated

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng/commands/view.c b/src/bin/lttng/commands/view.c
index faca60de8b980adfe60afcb2ac68a7c202a65595..0325e505c505fab3dab2bc666fa7caec40822aa4 100644 (file)
--- a/src/bin/lttng/commands/view.c
+++ b/src/bin/lttng/commands/view.c
@@ -302,6 +302,7 @@ static int view_trace(void)
        int ret;
        char *session_name, *trace_path = NULL;
        struct lttng_session *sessions = NULL;
        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,
 
        /*
         * Safety net. If lttng is suid at some point for *any* useless reasons,


@@ -379,6 +380,7 @@ static int view_trace(void)
                                ret = CMD_ERROR;
                                goto free_sessions;
                        }
                                ret = CMD_ERROR;
                                goto free_sessions;
                        }

+                       free_trace_path = true;

                } else {
                        /* Get file system session path. */
                        trace_path = sessions[i].path;
                } else {
                        /* Get file system session path. */
                        trace_path = sessions[i].path;


@@ -396,7 +398,7 @@ static int view_trace(void)
        }
 
 free_sessions:
        }
 
 free_sessions:

-       if (session_live_mode) {
+       if (session_live_mode && free_trace_path) {

                free(trace_path);
        }
        free(sessions);
                free(trace_path);
        }
        free(sessions);