* [lttng-dev] [PATCH lttng-tools] Fix: Null check before destroying health_sessiond
@ 2019-09-20 15:15 Jonathan Rajotte
2019-09-20 21:24 ` Jérémie Galarneau
0 siblings, 1 reply; 2+ messages in thread
From: Jonathan Rajotte @ 2019-09-20 15:15 UTC (permalink / raw)
Fixes coverity #1399735
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
---
src/bin/lttng-sessiond/main.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 5f99bdbf6..a428630f8 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1819,7 +1819,9 @@ stop_threads:
lttng_pipe_destroy(ust64_channel_monitor_pipe);
lttng_pipe_destroy(kernel_channel_monitor_pipe);
- health_app_destroy(health_sessiond);
+ if (health_sessiond) {
+ health_app_destroy(health_sessiond);
+ }
exit_create_run_as_worker_cleanup:
exit_options:
sessiond_cleanup_lock_file();
--
2.17.1
^ permalink raw reply [flat|nested] 2+ messages in thread* [lttng-dev] [PATCH lttng-tools] Fix: Null check before destroying health_sessiond
2019-09-20 15:15 [lttng-dev] [PATCH lttng-tools] Fix: Null check before destroying health_sessiond Jonathan Rajotte
@ 2019-09-20 21:24 ` Jérémie Galarneau
0 siblings, 0 replies; 2+ messages in thread
From: Jérémie Galarneau @ 2019-09-20 21:24 UTC (permalink / raw)
Merged in master and stable-2.11. Thanks!
J?r?mie
On Fri, Sep 20, 2019 at 11:15:12AM -0400, Jonathan Rajotte wrote:
> Fixes coverity #1399735
>
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
> ---
> src/bin/lttng-sessiond/main.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
> index 5f99bdbf6..a428630f8 100644
> --- a/src/bin/lttng-sessiond/main.c
> +++ b/src/bin/lttng-sessiond/main.c
> @@ -1819,7 +1819,9 @@ stop_threads:
> lttng_pipe_destroy(ust64_channel_monitor_pipe);
> lttng_pipe_destroy(kernel_channel_monitor_pipe);
>
> - health_app_destroy(health_sessiond);
> + if (health_sessiond) {
> + health_app_destroy(health_sessiond);
> + }
> exit_create_run_as_worker_cleanup:
> exit_options:
> sessiond_cleanup_lock_file();
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-09-20 21:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-20 15:15 [lttng-dev] [PATCH lttng-tools] Fix: Null check before destroying health_sessiond Jonathan Rajotte
2019-09-20 21:24 ` Jérémie Galarneau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox