diff options
| author | Russell Bryant <russell@russellbryant.com> | 2008-02-27 01:16:06 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2008-02-27 01:16:06 +0000 |
| commit | c1fb44537b5d9dc8079f1da35f2c249b449798ed (patch) | |
| tree | 9a97a54b69f24539298ca0064d9dcc0f153d7c25 /apps | |
| parent | d07578d1e1a59fdc2b8aed8e8d2b7645af87c0e3 (diff) | |
Merged revisions 104334 via svnmerge from
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
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_chanspy.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 21e466fb3..faa665789 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -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); |