From: George Joseph <gjoseph@digium.com>
Date: Thu, 20 Sep 2018 15:15:48 +0000 (-0600)
Subject: app_voicemail:  Cleanup mailbox topic and cache
X-Git-Tag: 15.7.0-rc1~32^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4181fa6772a39d0b8760fc7d38b7b8b2015a7def;p=thirdparty%2Fasterisk.git

app_voicemail:  Cleanup mailbox topic and cache

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
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 74c32f529f..0a453d075e 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -2002,6 +2002,10 @@ static void free_user(struct ast_vm_user *vmu)
 		return;
 	}
 
+	if (!ast_strlen_zero(vmu->mailbox)) {
+		ast_delete_mwi_state_full(vmu->mailbox, vmu->context, NULL);
+	}
+
 	ast_free(vmu->email);
 	vmu->email = NULL;
 	ast_free(vmu->emailbody);
diff --git a/main/app.c b/main/app.c
index 6a62c838d1..19cbfded1f 100644
--- a/main/app.c
+++ b/main/app.c
@@ -3344,6 +3344,9 @@ int ast_delete_mwi_state_full(const char *mailbox, const char *context, struct a
 	if (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);
 	return 0;
 }