From: Richard Mudgett Date: Thu, 12 Jul 2012 20:20:02 +0000 (+0000) Subject: Add missing ast_hangup() calls on some analog exception paths. X-Git-Tag: 10.8.0-rc1~3^2~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd35b875f657c368e3bafb1703a239d62696d34a;p=thirdparty%2Fasterisk.git Add missing ast_hangup() calls on some analog exception paths. Make starting analog_ss_thread() or __analog_ss_thread() failure paths hangup the channel. ........ Merged revisions 370017 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@370025 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 9a464248f0..07b50a503d 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -11708,6 +11708,7 @@ static struct dahdi_pvt *handle_init_event(struct dahdi_pvt *i, int event) ast_log(LOG_WARNING, "Cannot allocate new structure on channel %d\n", i->channel); } else if (ast_pthread_create_detached(&threadid, NULL, analog_ss_thread, chan)) { ast_log(LOG_WARNING, "Unable to start simple switch thread on channel %d\n", i->channel); + ast_hangup(chan); } } break; @@ -11975,6 +11976,7 @@ static void *do_monitor(void *data) res = ast_pthread_create_detached(&threadid, NULL, analog_ss_thread, chan); if (res) { ast_log(LOG_WARNING, "Unable to start simple switch thread on channel %d\n", i->channel); + ast_hangup(chan); } else { i->dtmfcid_holdoff_state = 1; } diff --git a/channels/sig_analog.c b/channels/sig_analog.c index 2c4bbb4b85..35593ad055 100644 --- a/channels/sig_analog.c +++ b/channels/sig_analog.c @@ -3837,6 +3837,7 @@ void *analog_handle_init_event(struct analog_pvt *i, int event) ast_log(LOG_WARNING, "Cannot allocate new structure on channel %d\n", i->channel); } else if (ast_pthread_create_detached(&threadid, NULL, __analog_ss_thread, i)) { ast_log(LOG_WARNING, "Unable to start simple switch thread on channel %d\n", i->channel); + ast_hangup(chan); } } break; @@ -3861,6 +3862,7 @@ void *analog_handle_init_event(struct analog_pvt *i, int event) ast_log(LOG_WARNING, "Cannot allocate new structure on channel %d\n", i->channel); } else if (ast_pthread_create_detached(&threadid, NULL, __analog_ss_thread, i)) { ast_log(LOG_WARNING, "Unable to start simple switch thread on channel %d\n", i->channel); + ast_hangup(chan); } } break;