Merged!

On 11 Nov (15:30:08), Jérémie Galarneau wrote:
> Some error-handling code paths may call ht_cleanup_push() with NULL hash
> tables which will crash the clean-up thread.
> 
> Signed-off-by: Jérémie Galarneau <[email protected]>
> ---
>  src/bin/lttng-sessiond/utils.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/src/bin/lttng-sessiond/utils.c b/src/bin/lttng-sessiond/utils.c
> index 2ff57cd..c9c51ed 100644
> --- a/src/bin/lttng-sessiond/utils.c
> +++ b/src/bin/lttng-sessiond/utils.c
> @@ -52,6 +52,9 @@ void ht_cleanup_push(struct lttng_ht *ht)
>       ssize_t ret;
>       int fd = ht_cleanup_pipe[1];
>  
> +     if (!ht) {
> +             return;
> +     }
>       if (fd < 0)
>               return;
>       ret = lttng_write(fd, &ht, sizeof(ht));
> -- 
> 1.8.4.2
> 
> 
> _______________________________________________
> lttng-dev mailing list
> [email protected]
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Attachment: signature.asc
Description: Digital signature

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Reply via email to