ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

Fixed flush() method of trap_manager_t. 

A segmentation fault could have happened during destruction of the trap
manager after calling flush().
This commit is contained in:
Tobias Brunner 2011-12-23 10:38:10 +01:00
parent a24f2241bc
commit d6656f11e4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libcharon/sa/trap_manager.c
View File

@ -353,15 +353,21 @@ METHOD(listener_t, child_state_change, bool,
METHOD(trap_manager_t, flush, void,
private_trap_manager_t *this)
{
this->traps->invoke_function(this->traps, (void*)destroy_entry);
linked_list_t *traps;
/* since destroying the CHILD_SA results in events which require a read
* lock we cannot destroy the list while holding the write lock */
this->lock->write_lock(this->lock);
traps = this->traps;
this->traps = linked_list_create();
this->lock->unlock(this->lock);
traps->destroy_function(traps, (void*)destroy_entry);
}
METHOD(trap_manager_t, destroy, void,
private_trap_manager_t *this)
{
charon->bus->remove_listener(charon->bus, &this->listener.listener);
this->traps->invoke_function(this->traps, (void*)destroy_entry);
this->traps->destroy(this->traps);
this->traps->destroy_function(this->traps, (void*)destroy_entry);
this->lock->destroy(this->lock);
free(this);
}