[Asterisk-cvs] asterisk/channels chan_zap.c,1.485,1.486

markster markster
Thu Aug 11 12:40:17 CDT 2005


Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv28156/channels

Modified Files:
	chan_zap.c 
Log Message:
Fix potential deadlock in asterisk


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -d -r1.485 -r1.486
--- chan_zap.c	9 Aug 2005 01:59:59 -0000	1.485
+++ chan_zap.c	11 Aug 2005 16:43:36 -0000	1.486
@@ -3200,6 +3200,7 @@
 		ast_log(LOG_DEBUG, "Neither %s nor %s are in a bridge, nothing to transfer\n",
 					p->subs[SUB_REAL].owner->name, p->subs[SUB_THREEWAY].owner->name);
 		p->subs[SUB_THREEWAY].owner->_softhangup |= AST_SOFTHANGUP_DEV;
+		return -1;
 	}
 	return 0;
 }




More information about the svn-commits mailing list