[asterisk-commits] russell: trunk r73599 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Jul  5 18:59:50 2007
New Revision: 73599

URL: http://svn.digium.com/view/asterisk?view=rev&rev=73599
Log:
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)

........

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

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

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=73599&r1=73598&r2=73599
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Jul  5 18:59:50 2007
@@ -18460,7 +18460,7 @@
 	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);