1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post-review fix.

Browse Source 
sql/sp_head.cc:
  Post-review fix; changed string copying method (+ fixed comment typo and indention).
This commit is contained in:
unknown 2005-10-21 13:08:00 +02:00
parent a7f4882a43
commit d9b0a62e93
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sp_head.cc
View File

@ -295,7 +295,7 @@ sp_eval_func_item(THD *thd, Item **it_addr, enum enum_field_types type,
/* /*
For some functions, 's' is now pointing to an argument of the For some functions, 's' is now pointing to an argument of the
function, which might be a local variable that it to be reused. function, which might be a local variable that is to be reused.
In this case, new(reuse, &rsize) below will call the destructor In this case, new(reuse, &rsize) below will call the destructor
and 's' ends up pointing to freed memory. and 's' ends up pointing to freed memory.
A somewhat ugly fix is to simply copy the string to our local one A somewhat ugly fix is to simply copy the string to our local one
@ -304,7 +304,8 @@ sp_eval_func_item(THD *thd, Item **it_addr, enum enum_field_types type,
*/ */
if (reuse && s != &tmp && s != &it->str_value) if (reuse && s != &tmp && s != &it->str_value)
{ {
tmp.copy(s->c_ptr(), s->length(), it->collation.collation); if (tmp.copy((const String)(*s)))
DBUG_RETURN(NULL);
s= &tmp; s= &tmp;
} }
@ -338,7 +339,7 @@ sp_eval_func_item(THD *thd, Item **it_addr, enum enum_field_types type,
return_null_item: return_null_item:
CREATE_ON_CALLERS_ARENA(it= new(reuse, &rsize) Item_null(), CREATE_ON_CALLERS_ARENA(it= new(reuse, &rsize) Item_null(),
use_callers_arena, &backup_arena); use_callers_arena, &backup_arena);
end: end:
it->rsize= rsize; it->rsize= rsize;