[asterisk-commits] rmudgett: branch 1.8 r338800 - /branches/1.8/channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Sep 30 17:05:10 2011
New Revision: 338800

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=338800
Log:
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:
    branches/1.8/channels/chan_dahdi.c

Modified: branches/1.8/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_dahdi.c?view=diff&rev=338800&r1=338799&r2=338800
==============================================================================
--- branches/1.8/channels/chan_dahdi.c (original)
+++ branches/1.8/channels/chan_dahdi.c Fri Sep 30 17:05:10 2011
@@ -10610,9 +10610,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_log(LOG_DEBUG, "CID got digit '%c'\n", f->subclass.integer);