[asterisk-commits] russell: branch 1.6.0 r109837 - in /branches/1.6.0: ./ apps/app_chanspy.c

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Mar 18 23:04:13 2008
New Revision: 109837

URL: http://svn.digium.com/view/asterisk?view=rev&rev=109837
Log:
Merged revisions 109764 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r109764 | russell | 2008-03-18 17:36:02 -0500 (Tue, 18 Mar 2008) | 11 lines

Merged revisions 109763 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r109763 | russell | 2008-03-18 17:34:42 -0500 (Tue, 18 Mar 2008) | 3 lines

Fix one place where the chanspy datastore isn't removed from a channel.
(issue #12243, reported by atis, patch by me)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_chanspy.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_chanspy.c?view=diff&rev=109837&r1=109836&r2=109837
==============================================================================
--- branches/1.6.0/apps/app_chanspy.c (original)
+++ branches/1.6.0/apps/app_chanspy.c Tue Mar 18 23:04:13 2008
@@ -714,8 +714,10 @@
 					res = ast_streamfile(chan, peer_name, chan->language);
 					if (!res)
 						res = ast_waitstream(chan, "");
-					if (res)
+					if (res) {
+						chanspy_ds_free(peer_chanspy_ds);
 						break;
+					}
 				} else
 					res = ast_say_character_str(chan, peer_name, "", chan->language);
 				if ((num = atoi(ptr)))
@@ -731,6 +733,7 @@
 				goto exit;
 			} else if (res == -2) {
 				res = 0;
+				chanspy_ds_free(peer_chanspy_ds);
 				goto exit;
 			} else if (res > 1 && spec) {
 				struct ast_channel *next;