[svn-commits] file: branch 1.2 r39056 - /branches/1.2/channel.c

svn-commits at lists.digium.com svn-commits at lists.digium.com
Sun Aug 6 17:15:52 MST 2006


Author: file
Date: Sun Aug  6 19:15:51 2006
New Revision: 39056

URL: http://svn.digium.com/view/asterisk?rev=39056&view=rev
Log:
Reset our stream and vstream pointers back to NULL so that any generator that uses them (file based MOH) will not try to close them again. (issue #7668 reported by jmls)

Modified:
    branches/1.2/channel.c

Modified: branches/1.2/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channel.c?rev=39056&r1=39055&r2=39056&view=diff
==============================================================================
--- branches/1.2/channel.c (original)
+++ branches/1.2/channel.c Sun Aug  6 19:15:51 2006
@@ -1307,10 +1307,16 @@
 		return 0;
 	}
 	free_translation(chan);
-	if (chan->stream) 		/* Close audio stream */
+	/* Close audio stream */
+	if (chan->stream) {
 		ast_closestream(chan->stream);
-	if (chan->vstream)		/* Close video stream */
+		chan->stream = NULL;
+	}
+	/* Close video stream */
+	if (chan->vstream) {
 		ast_closestream(chan->vstream);
+		chan->vstream = NULL;
+	}
 	if (chan->sched) {
 		sched_context_destroy(chan->sched);
 		chan->sched = NULL;



More information about the svn-commits mailing list