projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Possible dereference of null pointers
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
load-session-thread.c
diff --git
a/src/bin/lttng-sessiond/load-session-thread.c
b/src/bin/lttng-sessiond/load-session-thread.c
index 845948e7cd559363395efd82e05c283145b7e21c..3be93cf8de4109440fcec26cb96760222ff0d152 100644
(file)
--- a/
src/bin/lttng-sessiond/load-session-thread.c
+++ b/
src/bin/lttng-sessiond/load-session-thread.c
@@
-16,6
+16,7
@@
*/
#define _GNU_SOURCE
*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <common/error.h>
#include <common/config/config.h>
#include <common/error.h>
#include <common/config/config.h>
@@
-51,7
+52,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;
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);
assert(data);
@@
-75,6
+76,7
@@
int load_session_init_data(struct load_session_thread_data **data)
return 0;
error:
return 0;
error:
+ free(_data);
return -1;
}
return -1;
}
@@
-95,7
+97,8
@@
void *thread_load_session(void *data)
goto end;
}
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));
}
if (ret) {
ERR("Session load failed: %s", error_get_str(ret));
}
This page took
0.024034 seconds
and
4
git commands to generate.