From: jeremie.galarneau@efficios.com (Jérémie Galarneau)
Subject: [lttng-dev] [PATCH lttng-tools] Fix: Null check before destroying health_sessiond
Date: Fri, 20 Sep 2019 17:24:44 -0400 [thread overview]
Message-ID: <20190920212444.GC20024@gmail.com> (raw)
In-Reply-To: <20190920151512.12956-1-jonathan.rajotte-julien@efficios.com>
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
>
prev parent reply other threads:[~2019-09-20 21:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-20 15:15 Jonathan Rajotte
2019-09-20 21:24 ` Jérémie Galarneau [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190920212444.GC20024@gmail.com \
--to=jeremie.galarneau@efficios.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox