[lttng-dev] [PATCH lttng-tools 2/2] Assert on null index_file

[Jérémie Galarneau]

Merged with a slightly modified title in master, stable-2.10 and stable-2.9.

"Fix: assert() on null index_file in lttng_index_file_write()"

Thanks,
Jérémie

On 8 May 2017 at 11:22, Jonathan Rajotte
<jonathan.rajotte-julien at efficios.com> wrote:
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
> ---
>  src/common/index/index.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/src/common/index/index.c b/src/common/index/index.c
> index b481badb..c94ec701 100644
> --- a/src/common/index/index.c
> +++ b/src/common/index/index.c
> @@ -128,12 +128,16 @@ error:
>  int lttng_index_file_write(const struct lttng_index_file *index_file,
>                 const struct ctf_packet_index *element)
>  {
> +       int fd;
> +       size_t len;
>         ssize_t ret;
> -       int fd = index_file->fd;
> -       size_t len = index_file->element_len;
>
> +       assert(index_file);
>         assert(element);
>
> +       fd = index_file->fd;
> +       len = index_file->element_len;
> +
>         if (fd < 0) {
>                 goto error;
>         }
> --
> 2.11.0
>



-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com