projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: null pointer dereference in lttng_rotation_handle_destroy
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
main.c
diff --git
a/src/bin/lttng-sessiond/main.c
b/src/bin/lttng-sessiond/main.c
index 4c885d7b74f63f2c51447932fe36afccabb81d8e..8e8b83b0f54a48d7d063f6cc668645ba804de7be 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-74,7
+74,7
@@
#include "notification-thread.h"
#include "notification-thread-commands.h"
#include "rotation-thread.h"
#include "notification-thread.h"
#include "notification-thread-commands.h"
#include "rotation-thread.h"
-#include "syscall.h"
+#include "
lttng-
syscall.h"
#include "agent.h"
#include "ht-cleanup.h"
#include "sessiond-config.h"
#include "agent.h"
#include "ht-cleanup.h"
#include "sessiond-config.h"
@@
-4204,12
+4204,10
@@
error_add_context:
cmd_ctx->lsm->u.rotate_setup.timer_us,
cmd_ctx->lsm->u.rotate_setup.size,
notification_thread_handle);
cmd_ctx->lsm->u.rotate_setup.timer_us,
cmd_ctx->lsm->u.rotate_setup.size,
notification_thread_handle);
- if (ret < 0) {
- ret = -ret;
+ if (ret != LTTNG_OK) {
goto error;
}
goto error;
}
- ret = LTTNG_OK;
break;
}
case LTTNG_ROTATION_SCHEDULE_GET_TIMER_PERIOD:
break;
}
case LTTNG_ROTATION_SCHEDULE_GET_TIMER_PERIOD:
@@
-4931,7
+4929,7
@@
static int set_option(int opt, const char *arg, const char *optname)
} else if (string_match(optname, "no-kernel")) {
config.no_kernel = true;
} else if (string_match(optname, "quiet") || opt == 'q') {
} else if (string_match(optname, "no-kernel")) {
config.no_kernel = true;
} else if (string_match(optname, "quiet") || opt == 'q') {
-
lttng_opt_
quiet = true;
+
config.
quiet = true;
} else if (string_match(optname, "verbose") || opt == 'v') {
/* Verbose level can increase using multiple -v */
if (arg) {
} else if (string_match(optname, "verbose") || opt == 'v') {
/* Verbose level can increase using multiple -v */
if (arg) {
This page took
0.023657 seconds
and
4
git commands to generate.