aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-04-26 00:18:36 +0000
committerautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-04-26 00:18:36 +0000
commitc742d4a7431ab805a113acbaefc5e762c3fba2af (patch)
treea7da7be092e7afa848adfdf6eaba7e6305573f90 /channels
parentb0e6738082795b63a3070e4af40cae1c183387e9 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@61957 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_zap.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 755e80661..e67a73cc2 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -5389,6 +5389,16 @@ static void *ss_thread(void *data)
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);
index = zt_get_index(chan, p, 1);