fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

gallium: Make handle_table reentrant.

Browse source 
Ensure that the object has consistent state also when calling the destroy
callback. Namely, ensure the object passed to the callback is removed from
the table prior to calling the destroy callback to avoid a infinite loop or
double free.
This commit is contained in:
José Fonseca 2008-11-11 23:27:27 +09:00
parent 7e584a70c4
commit c13cf0d690
1 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/gallium/auxiliary/util/u_handle_table.c
View file

@ -124,6 +124,28 @@ handle_table_resize(struct handle_table *ht,
}
static INLINE void
handle_table_clear(struct handle_table *ht,
unsigned index)
{
void *object;
/* The order here is important so that the object being destroyed is not
* present in the table when seen by the destroy callback, because the
* destroy callback may directly or indirectly call the other functions in
* this module.
*/
object = ht->objects[index];
if(object) {
ht->objects[index] = NULL;
if(ht->destroy)
ht->destroy(object);
}
}
unsigned
handle_table_add(struct handle_table *ht,
void *object)
@ -184,9 +206,8 @@ handle_table_set(struct handle_table *ht,
if(!handle_table_resize(ht, index))
return 0;
if(ht->objects[index] && ht->destroy)
ht->destroy(ht->objects[index]);
handle_table_clear(ht, index);
ht->objects[index] = object;
return handle;
@ -227,10 +248,8 @@ handle_table_remove(struct handle_table *ht,
if(!object)
return;
if(ht->destroy)
ht->destroy(object);
handle_table_clear(ht, index);
ht->objects[index] = NULL;
if(index < ht->filled)
ht->filled = index;
}
@ -266,8 +285,7 @@ handle_table_destroy(struct handle_table *ht)
if(ht->destroy)
for(index = 0; index < ht->size; ++index)
if(ht->objects[index])
ht->destroy(ht->objects[index]);
handle_table_clear(ht, index);
FREE(ht->objects);
FREE(ht);