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

Optimization during review

Browse source 
Add extra check to delete [] to ensure we are not deleting not allocated data
This commit is contained in:
monty@mysql.com 2005-07-01 09:40:05 +03:00
parent f4a30c4d3b
commit e3a4c1a6b2
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sql/sql_select.cc
View file

@ -8222,12 +8222,10 @@ cp_buffer_from_ref(THD *thd, TABLE_REF *ref)
thd->count_cuted_fields= CHECK_FIELD_IGNORE; thd->count_cuted_fields= CHECK_FIELD_IGNORE;
for (store_key **copy=ref->key_copy ; *copy ; copy++) for (store_key **copy=ref->key_copy ; *copy ; copy++)
{ {
int res; if ((*copy)->copy() & 1)
if ((res= (*copy)->copy()))
{ {
thd->count_cuted_fields= save_count_cuted_fields; thd->count_cuted_fields= save_count_cuted_fields;
if ((res= res & 1)) return 1; // Something went wrong
return res; // Something went wrong
} }
} }
thd->count_cuted_fields= save_count_cuted_fields; thd->count_cuted_fields= save_count_cuted_fields;
@ -8818,7 +8816,8 @@ setup_copy_fields(THD *thd, TMP_TABLE_PARAM *param,
DBUG_RETURN(0); DBUG_RETURN(0);
err: err:
delete [] param->copy_field; // This is never 0 if (copy)
delete [] param->copy_field;
param->copy_field=0; param->copy_field=0;
err2: err2:
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);