mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 18:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed memory leak in ROW code (SCRUM 577)

Browse source
This commit is contained in:
bell@sanja.is.com.ua 2003-01-28 22:28:11 +02:00
parent d39a2c0afc
commit d0d375c437
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sql/item_cmpfunc.cc
View file

@ -1078,8 +1078,9 @@ in_string::in_string(uint elements,qsort_cmp cmp_func)
in_string::~in_string()
{
for (uint i=0 ; i < count ; i++)
((String*) base)[i].free();
if (base)
for (uint i=0 ; i < count ; i++)
((String*) base)[i].free();
}
void in_string::set(uint pos,Item *item)
@ -1100,12 +1101,20 @@ byte *in_string::get_value(Item *item)
in_row::in_row(uint elements, Item * item)
{
DBUG_ENTER("in_row::in_row");
base= (char*) new cmp_item_row[elements];
base= (char*) new cmp_item_row[count= elements];
size= sizeof(cmp_item_row);
compare= (qsort_cmp) cmp_row;
tmp.store_value(item);
DBUG_VOID_RETURN;
}
in_row::~in_row()
{
if (base)
{
cmp_item_row *arr= (cmp_item_row *) base;
for (uint i=0 ; i < count ; i++)
arr[i].~cmp_item_row();
}
}
byte *in_row::get_value(Item *item)

1
sql/item_cmpfunc.h
View file

@ -557,6 +557,7 @@ class in_row :public in_vector
cmp_item_row tmp;
public:
in_row(uint elements, Item *);
~in_row();
void set(uint pos,Item *item);
byte *get_value(Item *item);
};