diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-08-17 21:04:33 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-08-17 21:04:33 +0000 |
| commit | 57d5934e5d1f809dcae7f9a933bed90b3ce92f82 (patch) | |
| tree | 1501c976c13115f13421ddd46674cb1d255e9bf3 /channels/chan_zap.c | |
| parent | d49ae61c364f5a7ab1907a282659f91c112fcca0 (diff) | |
Merged revisions 79912 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r79912 | russell | 2007-08-17 16:01:43 -0500 (Fri, 17 Aug 2007) | 4 lines
Avoid a crash in the handling of DTMF based Caller ID. It is valid for
ast_read to return NULL in the case that the channel has been hung up.
(crash reported by anonymouz666 on IRC in #asterisk-dev)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79913 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_zap.c')
| -rw-r--r-- | channels/chan_zap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 250099d18..60d9e2e9d 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -6397,6 +6397,8 @@ static void *ss_thread(void *data) return NULL; } f = ast_read(chan); + if (!f) + break; if (f->frametype == AST_FRAME_DTMF) { dtmfbuf[i++] = f->subclass; ast_debug(1, "CID got digit '%c'\n", f->subclass); |