[asterisk-commits] rmudgett: trunk r338802 - in /trunk: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Sep 30 17:08:48 2011
New Revision: 338802

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=338802
Log:
Merged revisions 338801 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r338801 | rmudgett | 2011-09-30 17:06:48 -0500 (Fri, 30 Sep 2011) | 19 lines
  
  Merged revisions 338800 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r338800 | rmudgett | 2011-09-30 17:05:10 -0500 (Fri, 30 Sep 2011) | 12 lines
    
    Fix segfault in analog_ss_thread() not checking ast_read() for NULL.
    
    NOTE: The problem was reported against v1.6.2.  It is unlikely to ever
    happen on v1.8 and above since chan_dahdi.c:analog_ss_thread() is unlikely
    to be used.  The version in sig_analog.c has largely replaced it.
    
    (closes issue ASTERISK-18648)
    Reported by: Stephan Bosch
    Patches:
          jira_asterisk_18648_v1.8.patch (license #5621) patch uploaded by rmudgett
    Tested by: Stephan Bosch
  ........
................

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

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

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=338802&r1=338801&r2=338802
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Fri Sep 30 17:08:48 2011
@@ -10695,9 +10695,14 @@
 						ast_log(LOG_WARNING, "DTMFCID timed out waiting for ring. "
 							"Exiting simple switch\n");
 						ast_hangup(chan);
-						return NULL;
+						goto quit;
 					}
 					f = ast_read(chan);
+					if (!f) {
+						/* Hangup received waiting for DTMFCID. Exiting simple switch. */
+						ast_hangup(chan);
+						goto quit;
+					}
 					if (f->frametype == AST_FRAME_DTMF) {
 						dtmfbuf[k++] = f->subclass.integer;
 						ast_debug(1, "CID got digit '%c'\n", f->subclass.integer);