From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 27 Feb 2008 01:15:02 +0000 (+0000)
Subject: Avoid some recursion in the cleanup code for the chanspy datastore
X-Git-Tag: 1.4.19~135
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c882e6da6f4f76ec10bf5111288e5f6fe825f71d;p=thirdparty%2Fasterisk.git

Avoid some recursion in the cleanup code for the chanspy datastore
(closes issue #12076, reported by junky, patched by me)


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

diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index adea928eee..297bbec97c 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -409,6 +409,8 @@ static struct chanspy_ds *chanspy_ds_free(struct chanspy_ds *chanspy_ds)
 		if ((datastore = ast_channel_datastore_find(chan, &chanspy_ds_info, NULL))) {
 			ast_channel_datastore_remove(chan, datastore);
 			/* chanspy_ds->chan is NULL after this call */
+			chanspy_ds_destroy(datastore->data);
+			datastore->data = NULL;
 			ast_channel_datastore_free(datastore);
 		}
 		ast_channel_unlock(chan);