[Tarantool-patches] [PATCH] sql: fix memleak during parsing

[Tarantool-patches] [PATCH] sql: fix memleak during parsing

[Roman Khabibov]

Fix a memory leak generated by allocation of indexes array of
parser ephemeral space.
---

Branch: https://github.com/tarantool/tarantool/tree/romanhabibov/sql-memleak

P.S. It's really memleak, I checked with valgrind.

 src/box/sql/tokenize.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/box/sql/tokenize.c b/src/box/sql/tokenize.c
index 5404a78e9..6cf92b4f7 100644
--- a/src/box/sql/tokenize.c
+++ b/src/box/sql/tokenize.c
@@ -447,6 +447,8 @@ parser_space_delete(struct sql *db, struct space *space)
 	assert(space->def->opts.is_ephemeral);
 	for (uint32_t i = 0; i < space->index_count; ++i)
 		index_def_delete(space->index[i]->def);
+	if (space->index_count != 0)
+		free(space->index);
 }
 
 /**
-- 
2.24.3 (Apple Git-128)

Re: [Tarantool-patches] [PATCH] sql: fix memleak during parsing

[Nikita Pettik]

On 23 Sep 17:26, Roman Khabibov wrote:
> Fix a memory leak generated by allocation of indexes array of
> parser ephemeral space.
> ---

I'd fix a bit commit message:

Fix a memory leak during execution of CREATE TABLE statement:
indexes to be created are stored in space->index array, which in
turn is allocated using malloc, but is never freed.
 
LGTM otherwise.

> Branch: https://github.com/tarantool/tarantool/tree/romanhabibov/sql-memleak
> 
> P.S. It's really memleak, I checked with valgrind.
> 
>  src/box/sql/tokenize.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/src/box/sql/tokenize.c b/src/box/sql/tokenize.c
> index 5404a78e9..6cf92b4f7 100644
> --- a/src/box/sql/tokenize.c
> +++ b/src/box/sql/tokenize.c
> @@ -447,6 +447,8 @@ parser_space_delete(struct sql *db, struct space *space)
>  	assert(space->def->opts.is_ephemeral);
>  	for (uint32_t i = 0; i < space->index_count; ++i)
>  		index_def_delete(space->index[i]->def);
> +	if (space->index_count != 0)
> +		free(space->index);
>  }
>  
>  /**
> -- 
> 2.24.3 (Apple Git-128)
> 

Re: [Tarantool-patches] [PATCH] sql: fix memleak during parsing

[Roman Khabibov]

Hello, thanks for the review!

> On Sep 24, 2020, at 16:12, Nikita Pettik <korablev@tarantool.org> wrote:
> 
> On 23 Sep 17:26, Roman Khabibov wrote:
>> Fix a memory leak generated by allocation of indexes array of
>> parser ephemeral space.
>> ---
> 
> I'd fix a bit commit message:
> 
> Fix a memory leak during execution of CREATE TABLE statement:
> indexes to be created are stored in space->index array, which in
> turn is allocated using malloc, but is never freed.
> 
> LGTM otherwise.
> 
>> Branch: https://github.com/tarantool/tarantool/tree/romanhabibov/sql-memleak
>> 
>> P.S. It's really memleak, I checked with valgrind.
>> 
>> src/box/sql/tokenize.c | 2 ++
>> 1 file changed, 2 insertions(+)
>> 
>> diff --git a/src/box/sql/tokenize.c b/src/box/sql/tokenize.c
>> index 5404a78e9..6cf92b4f7 100644
>> --- a/src/box/sql/tokenize.c
>> +++ b/src/box/sql/tokenize.c
>> @@ -447,6 +447,8 @@ parser_space_delete(struct sql *db, struct space *space)
>> 	assert(space->def->opts.is_ephemeral);
>> 	for (uint32_t i = 0; i < space->index_count; ++i)
>> 		index_def_delete(space->index[i]->def);
>> +	if (space->index_count != 0)
>> +		free(space->index);
>> }
>> 
>> /**
>> -- 
>> 2.24.3 (Apple Git-128)
>> 
Done.

commit b7de62663cde2a2b9d2181a9628602a560b268e1
Author: Roman Khabibov <roman.habibov@tarantool.org>
Date:   Wed Sep 23 14:40:23 2020 +0300

    sql: fix memleak during parsing
    
    Fix a memory leak during execution of CREATE TABLE statement:
    indexes to be created are stored in space->index array, which in
    turn is allocated using malloc, but is never freed.

diff --git a/src/box/sql/tokenize.c b/src/box/sql/tokenize.c
index 5404a78e9..6cf92b4f7 100644
--- a/src/box/sql/tokenize.c
+++ b/src/box/sql/tokenize.c
@@ -447,6 +447,8 @@ parser_space_delete(struct sql *db, struct space *space)
 	assert(space->def->opts.is_ephemeral);
 	for (uint32_t i = 0; i < space->index_count; ++i)
 		index_def_delete(space->index[i]->def);
+	if (space->index_count != 0)
+		free(space->index);
 }
 
 /**

Re: [Tarantool-patches] [PATCH] sql: fix memleak during parsing

[Vladislav Shpilevoy]

Hi! Thanks for the patch!

> diff --git a/src/box/sql/tokenize.c b/src/box/sql/tokenize.c
> index 5404a78e9..6cf92b4f7 100644
> --- a/src/box/sql/tokenize.c
> +++ b/src/box/sql/tokenize.c
> @@ -447,6 +447,8 @@ parser_space_delete(struct sql *db, struct space *space)
>  	assert(space->def->opts.is_ephemeral);
>  	for (uint32_t i = 0; i < space->index_count; ++i)
>  		index_def_delete(space->index[i]->def);
> +	if (space->index_count != 0)
> +		free(space->index);

Why do you check for index_count != 0? free() works
fine on NULL, which is the case when index_count is 0.

Re: [Tarantool-patches] [PATCH] sql: fix memleak during parsing

[Kirill Yukhin]

Hello,

On 23 сен 17:26, Roman Khabibov wrote:
> Fix a memory leak generated by allocation of indexes array of
> parser ephemeral space.
> ---
> 
> Branch: https://github.com/tarantool/tarantool/tree/romanhabibov/sql-memleak
> 
> P.S. It's really memleak, I checked with valgrind.
> 
>  src/box/sql/tokenize.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/src/box/sql/tokenize.c b/src/box/sql/tokenize.c
> index 5404a78e9..6cf92b4f7 100644
> --- a/src/box/sql/tokenize.c
> +++ b/src/box/sql/tokenize.c
> @@ -447,6 +447,8 @@ parser_space_delete(struct sql *db, struct space *space)
>  	assert(space->def->opts.is_ephemeral);
>  	for (uint32_t i = 0; i < space->index_count; ++i)
>  		index_def_delete(space->index[i]->def);
> +	if (space->index_count != 0)
> +		free(space->index);

What if there're more than 1 index?

--
Regards, Kirill Yukhin