kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

app_voicemail: Cleanup mailbox topic and cache

Browse Source 
app_voicemail wasn't properly cleaning up the stasis cache or the
mwi topic pool when the module was unloaded or when a user was
deleted as a result of a reload.  This resulted in leaks in both
areas.

* app_voicemail now calls ast_delete_mwi_state_full when it frees
  a user structure and ast_delete_mwi_state_full in turn now calls
  the new stasis_topic_pool_delete_topic function to clear the topic
  from the pool.

Change-Id: Ide23144a4a810e7e0faad5a8e988d15947965df8
This commit is contained in:
George Joseph
2018-09-20 09:15:48 -06:00
parent 9ec08d7532
commit 06c0676da0
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_voicemail.c
View File

@@ -2020,6 +2020,10 @@ static void free_user(struct ast_vm_user *vmu)
return; return;
} }
if (!ast_strlen_zero(vmu->mailbox)) {
ast_delete_mwi_state_full(vmu->mailbox, vmu->context, NULL);
}
ast_free(vmu->email); ast_free(vmu->email);
vmu->email = NULL; vmu->email = NULL;
ast_free(vmu->emailbody); ast_free(vmu->emailbody);

3
main/app.c
View File

@@ -3344,6 +3344,9 @@ int ast_delete_mwi_state_full(const char *mailbox, const char *context, struct a
if (clear_msg) { if (clear_msg) {
stasis_publish(mailbox_specific_topic, clear_msg); stasis_publish(mailbox_specific_topic, clear_msg);
} }
stasis_topic_pool_delete_topic(mwi_topic_pool, stasis_topic_name(mailbox_specific_topic));
ao2_cleanup(clear_msg); ao2_cleanup(clear_msg);
return 0; return 0;
} }