From mboxrd@z Thu Jan  1 00:00:00 1970
From: jeremie.galarneau@efficios.com (=?iso-8859-1?Q?J=E9r=E9mie?= Galarneau)
Date: Fri, 20 Sep 2019 17:24:44 -0400
Subject: [lttng-dev] [PATCH lttng-tools] Fix: Null check before
 destroying health_sessiond
In-Reply-To: <20190920151512.12956-1-jonathan.rajotte-julien@efficios.com>
References: <20190920151512.12956-1-jonathan.rajotte-julien@efficios.com>
Message-ID: <20190920212444.GC20024@gmail.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
>