[asterisk-commits] kpfleming: trunk r61915 - in /trunk: ./ channels/chan_zap.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Wed Apr 25 17:34:58 2007
New Revision: 61915

URL: http://svn.digium.com/view/asterisk?view=rev&rev=61915
Log:
Merged revisions 61914 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r61914 | kpfleming | 2007-04-25 17:29:53 -0500 (Wed, 25 Apr 2007) | 10 lines

Merged revisions 61913 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r61913 | kpfleming | 2007-04-25 17:24:59 -0500 (Wed, 25 Apr 2007) | 2 lines

handle a very bizarre race condition with channels being redirected before a simple switch can be started on them (issue #9286)

........

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

Modified:
    trunk/   (props changed)
    trunk/channels/chan_zap.c

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

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=61915&r1=61914&r2=61915
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Wed Apr 25 17:34:58 2007
@@ -5743,6 +5743,15 @@
 	int len = 0;
 	int res;
 	int index;
+
+	/* in the bizarre case where the channel has become a zombie before we
+	   even get started here, abort safely
+	*/
+	if (!p) {
+		ast_log(LOG_WARNING, "Channel became a zombie before simple switch could be started (%s)\n", chan->name);
+		ast_hangup(chan);
+		return NULL;
+	}
 
 	if (option_verbose > 2) 
 		ast_verbose( VERBOSE_PREFIX_3 "Starting simple switch on '%s'\n", chan->name);