X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fload-session-thread.c;h=868d7c55279b25e2455f626408cdf9118ffbdfd4;hb=0e1155633b00241b8b1e5a9bb683cf91b28f5eeb;hp=845948e7cd559363395efd82e05c283145b7e21c;hpb=ef367a93d16bb6f1a32e50e3538a56d4f18fe715;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/load-session-thread.c b/src/bin/lttng-sessiond/load-session-thread.c index 845948e7c..868d7c552 100644 --- a/src/bin/lttng-sessiond/load-session-thread.c +++ b/src/bin/lttng-sessiond/load-session-thread.c @@ -51,7 +51,7 @@ void load_session_destroy_data(struct load_session_thread_data *data) int load_session_init_data(struct load_session_thread_data **data) { int ret; - struct load_session_thread_data *_data; + struct load_session_thread_data *_data = NULL; assert(data); @@ -75,6 +75,7 @@ int load_session_init_data(struct load_session_thread_data **data) return 0; error: + free(_data); return -1; } @@ -95,7 +96,8 @@ void *thread_load_session(void *data) goto end; } - ret = config_load_session(info->path, NULL, 0); + /* Override existing session and autoload also. */ + ret = config_load_session(info->path, NULL, 1, 1); if (ret) { ERR("Session load failed: %s", error_get_str(ret)); }