diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-05 23:59:50 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-05 23:59:50 +0000 |
| commit | 1622932cd5589d21885d0be637b06d6d8c5ecfc5 (patch) | |
| tree | 075812b5b734d7e04322187dbae5637fff306073 | |
| parent | afee3acc96aa6e5a7a78a7b91f1c70362cbfe931 (diff) | |
Merged revisions 73598 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r73598 | russell | 2007-07-05 18:59:22 -0500 (Thu, 05 Jul 2007) | 3 lines
Fix a crash in chan_sip. Don't try to stop the monitor thread if it was never
started. (closes issue #10124, reported by gzero, fixed by me)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@73599 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index fc9937eaa..ee68902b5 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -18460,7 +18460,7 @@ static int unload_module(void) dialoglist_unlock(); ast_mutex_lock(&monlock); - if (monitor_thread && (monitor_thread != AST_PTHREADT_STOP)) { + if (monitor_thread && (monitor_thread != AST_PTHREADT_STOP) && (monitor_thread != AST_PTHREADT_NULL)) { pthread_cancel(monitor_thread); pthread_kill(monitor_thread, SIGURG); pthread_join(monitor_thread, NULL); |