[svn-commits] tilghman: branch 1.6.0 r124184 - in /branches/1.6.0: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Jun 19 18:02:49 2008
New Revision: 124184

URL: http://svn.digium.com/view/asterisk?view=rev&rev=124184
Log:
Merged revisions 124183 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r124183 | tilghman | 2008-06-19 17:59:41 -0500 (Thu, 19 Jun 2008) | 15 lines

Merged revisions 124182 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r124182 | tilghman | 2008-06-19 17:53:22 -0500 (Thu, 19 Jun 2008) | 7 lines

It's possible for a hangup to be received, even just after the initial cid
spill.
(closes issue #12453)
 Reported by: Alex728
 Patches: 
       20080604__bug12453.diff.txt uploaded by Corydon76 (license 14)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_dahdi.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_dahdi.c?view=diff&rev=124184&r1=124183&r2=124184
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Thu Jun 19 18:02:49 2008
@@ -6880,7 +6880,11 @@
 							ast_hangup(chan);
 							return NULL;
 						} 
-						f = ast_read(chan);
+						if (!(f = ast_read(chan))) {
+							ast_log(LOG_WARNING, "Hangup received waiting for ring. Exiting simple switch\n");
+							ast_hangup(chan);
+							return NULL;
+						}
 						ast_frfree(f);
 						if (chan->_state == AST_STATE_RING ||
 						    chan->_state == AST_STATE_RINGING)