[svn-commits] rmudgett: branch 11 r371891 - in /branches/11: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Aug 29 14:45:38 2012
New Revision: 371891

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=371891
Log:
Initialize file descriptors for dummy channels to -1.

Dummy channels usually aren't read from, but functions like SHELL and CURL
use autoservice on the channel.

(closes issue ASTERISK-20283)
Reported by: Gareth Palmer
Patches:
      svn-371580.patch (license #5169) patch uploaded by Gareth Palmer (modified)
........

Merged revisions 371888 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 371890 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    branches/11/   (props changed)
    branches/11/main/channel.c

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: branches/11/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/channel.c?view=diff&rev=371891&r1=371890&r2=371891
==============================================================================
--- branches/11/main/channel.c (original)
+++ branches/11/main/channel.c Wed Aug 29 14:45:38 2012
@@ -1207,6 +1207,18 @@
 
 	ast_pbx_hangup_handler_init(tmp);
 	AST_LIST_HEAD_INIT_NOLOCK(ast_channel_datastores(tmp));
+
+	/*
+	 * Init file descriptors to unopened state just in case
+	 * autoservice is called on the channel or something tries to
+	 * read a frame from it.
+	 */
+	ast_channel_timingfd_set(tmp, -1);
+	ast_channel_internal_alertpipe_clear(tmp);
+	ast_channel_internal_fd_clear_all(tmp);
+#ifdef HAVE_EPOLL
+	ast_channel_epfd(tmp) = -1;
+#endif
 
 	headp = ast_channel_varshead(tmp);
 	AST_LIST_HEAD_INIT_NOLOCK(headp);