diff options
| author | Matthew Jordan <mjordan@digium.com> | 2013-06-24 23:56:54 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2013-06-24 23:56:54 +0000 |
| commit | 91217ac3c1fd73efe13407a013260ac7cf937b7b (patch) | |
| tree | 767bdbef7b458a98b58a15d3953023c0e570b424 /main/presencestate.c | |
| parent | f33d074d1a57c4fab55197ec31404b785f90107c (diff) | |
Fix a variety of memory leaks
This patch addresses the following memory/ref counting leaks:
* main/devicestate.c - unsubscribe and join our devicestate message
subscription
* main/cel.c - clean up the datastore and config objects on exist
* main/parking.c - cleanup memory leak of retriever snapshot on message
payload destruction
* res/parking/parking_bridge.c - cleanup memory leak of retrieve snapshot
on message payload destruction
* main/presencestate.c - unsubscribe and join the caching topic on exit
* manager.c - properly unregister the manager action "BlindTransfer"
* sorcery.c - shutdown the threadpool on exit and dispose of any wizards
(issue ASTERISK-21906)
Reported by: John Hardin
patches:
cel.patch uploaded by jhardin (license #6512)
devicestate.patch uploaded by jhardin (license #6512)
manager.patch uploaded by jardin (license #6512)
presencestate.patch uploaded by jhardin (license #6512)
retriever-channel-snapshot.patch uploaded by jhardin (license #6512)
sorcery.patch uploaded by jhardin (license #6512)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392797 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/presencestate.c')
| -rw-r--r-- | main/presencestate.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/main/presencestate.c b/main/presencestate.c index 2eab99177..45174d5a1 100644 --- a/main/presencestate.c +++ b/main/presencestate.c @@ -314,8 +314,7 @@ static void presence_state_engine_cleanup(void) { ao2_cleanup(presence_state_topic_all); presence_state_topic_all = NULL; - ao2_cleanup(presence_state_topic_cached); - presence_state_topic_cached = NULL; + presence_state_topic_cached = stasis_caching_unsubscribe_and_join(presence_state_topic_cached); STASIS_MESSAGE_TYPE_CLEANUP(ast_presence_state_message_type); } |