From: Kevin P. Fleming <kpfleming@digium.com>
Date: Mon, 23 Jul 2012 14:41:03 +0000 (+0000)
Subject: Free any datastores attached to dummy channels.
X-Git-Tag: 1.8.16.0-rc1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aac6e33ba46738f245785d921d5bf025d25d53d9;p=thirdparty%2Fasterisk.git

Free any datastores attached to dummy channels.

Revision 370205 added the use of a datastore attached to a dummy channel to
resolve a memory leak, but ast_dummy_channel_destructor() in this branch did
not free datastores, resulting in a continued (but slightly smaller) memory
leak. This patch backports the change to free said datastores from the Asterisk
trunk.

(related to issue AST-916)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@370360 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/channel.c b/main/channel.c
index 05186025cd..2aca0c434f 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -2499,6 +2499,13 @@ static void ast_dummy_channel_destructor(void *obj)
 	struct ast_channel *chan = obj;
 	struct ast_var_t *vardata;
 	struct varshead *headp;
+	struct ast_datastore *datastore;
+
+	/* Get rid of each of the data stores on the channel */
+	while ((datastore = AST_LIST_REMOVE_HEAD(&chan->datastores, entry))) {
+		/* Free the data store */
+		ast_datastore_free(datastore);
+	}
 
 	headp = &chan->varshead;