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

Bug#22694 "function plugin_foreach_with_mask() uses an uninitialized pointer"

Browse Source 
Fix uninitialized memory.
This commit is contained in:
msvensson@pilot.mysql.com 2006-12-22 12:12:58 +01:00
parent c24381bdaa
commit abe43135b1
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sql/sql_plugin.cc
View File

@ -951,29 +951,30 @@ my_bool plugin_foreach_with_mask(THD *thd, plugin_foreach_func *func,
state_mask= ~state_mask; // do it only once state_mask= ~state_mask; // do it only once
rw_rdlock(&THR_LOCK_plugin); rw_rdlock(&THR_LOCK_plugin);
total= type == MYSQL_ANY_PLUGIN ? plugin_array.elements
: plugin_hash[type].records;
/*
Do the alloca out here in case we do have a working alloca:
leaving the nested stack frame invalidates alloca allocation.
*/
plugins=(struct st_plugin_int **)my_alloca(total*sizeof(*plugins));
if (type == MYSQL_ANY_PLUGIN) if (type == MYSQL_ANY_PLUGIN)
{ {
total=plugin_array.elements;
plugins=(struct st_plugin_int **)my_alloca(total*sizeof(*plugins));
for (idx= 0; idx < total; idx++) for (idx= 0; idx < total; idx++)
{ {
plugin= dynamic_element(&plugin_array, idx, struct st_plugin_int *); plugin= dynamic_element(&plugin_array, idx, struct st_plugin_int *);
if (plugin->state & state_mask) plugins[idx]= !(plugin->state & state_mask) ? plugin : NULL;
continue;
plugins[idx]= plugin;
} }
} }
else else
{ {
HASH *hash= &plugin_hash[type]; HASH *hash= plugin_hash + type;
total=hash->records;
plugins=(struct st_plugin_int **)my_alloca(total*sizeof(*plugins));
for (idx= 0; idx < total; idx++) for (idx= 0; idx < total; idx++)
{ {
plugin= (struct st_plugin_int *) hash_element(hash, idx); plugin= (struct st_plugin_int *) hash_element(hash, idx);
if (plugin->state & state_mask) if (plugin->state & state_mask)
continue; continue;
plugins[idx]= plugin; plugins[idx]= !(plugin->state & state_mask) ? plugin : NULL;
} }
} }
rw_unlock(&THR_LOCK_plugin); rw_unlock(&THR_LOCK_plugin);