Merged revisions 104334 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 27 Feb 2008 01:16:06 +0000 (01:16 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 27 Feb 2008 01:16:06 +0000 (01:16 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r104334 | russell | 2008-02-26 19:15:02 -0600 (Tue, 26 Feb 2008) | 3 lines

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/trunk@104335 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_chanspy.c

index 21e466f..faa6657 100644 (file)
@@ -446,6 +446,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);