[svn-commits] russell: trunk r104335 - in /trunk: ./ apps/app_chanspy.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Feb 26 19:16:06 2008
New Revision: 104335

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104335
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_chanspy.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_chanspy.c?view=diff&rev=104335&r1=104334&r2=104335
==============================================================================
--- trunk/apps/app_chanspy.c (original)
+++ trunk/apps/app_chanspy.c Tue Feb 26 19:16:06 2008
@@ -446,6 +446,8 @@
 		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);