Re: [Tarantool-patches] [PATCH] vinyl: fix leak in vy_build_recover_stmt

[Nikita Pettik <korablev@tarantool.org>]

On 06 Oct 07:13, Kirill Yukhin wrote:
> Hello,
> 
> On 05 окт 21:37, Nikita Pettik wrote:
> > On 05 Oct 18:33, Kirill Yukhin wrote:
> > > diff --git a/src/box/vinyl.c b/src/box/vinyl.c
> > > index cee39c5..a7ab24d 100644
> > > --- a/src/box/vinyl.c
> > > +++ b/src/box/vinyl.c
> > > @@ -4026,19 +4026,21 @@ vy_build_recover_stmt(struct vy_lsm *lsm, struct vy_lsm *pk,
> > >  		insert = vy_stmt_new_insert(lsm->mem_format,
> > >  					    data, data + data_len);
> > >  		if (insert == NULL)
> > > -			return -1;
> > > +			goto err;
> > >  	} else if (type == IPROTO_UPSERT) {
> > >  		struct tuple *new_tuple = vy_apply_upsert(mem_stmt, old_tuple,
> > >  							  pk->cmp_def, true);
> > >  		if (new_tuple == NULL)
> > > -			return -1;
> > > +			goto err;
> > >  		uint32_t data_len;
> > >  		const char *data = tuple_data_range(new_tuple, &data_len);
> > >  		insert = vy_stmt_new_insert(lsm->mem_format,
> > >  					    data, data + data_len);
> > >  		tuple_unref(new_tuple);
> > > -		if (insert == NULL)
> > > -			return -1;
> > > +		if (insert == NULL) {
> > > +			tuple_unref(new_tuple);
> > 
> > new_tuple is unrefed one line above unconditionally.
> 
> Thanks, removed. Iterative patch in the bottom.
> Branch force-pushed.

Pushed to master, 2.5, 2.4 and 1.10. Branch is dropped.
 
> --
> Regards, Kirill Yukhin
> 
> diff --git a/src/box/vinyl.c b/src/box/vinyl.c
> index a7ab24d..7e56299 100644
> --- a/src/box/vinyl.c
> +++ b/src/box/vinyl.c
> @@ -4037,10 +4037,8 @@ vy_build_recover_stmt(struct vy_lsm *lsm, struct vy_lsm *pk,
>  		insert = vy_stmt_new_insert(lsm->mem_format,
>  					    data, data + data_len);
>  		tuple_unref(new_tuple);
> -		if (insert == NULL) {
> -			tuple_unref(new_tuple);
> +		if (insert == NULL)
>  			goto err;
> -		}
>  	}
>  
>  	/* Insert DELETE + INSERT into the LSM tree. */