diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-17 21:04:33 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-17 21:04:33 +0000 |
| commit | 60264f8549b7dd85636f473bb0ce606104e2eaa3 (patch) | |
| tree | 1501c976c13115f13421ddd46674cb1d255e9bf3 /channels | |
| parent | 91e38a7babc4252eb293559bbd2ab18d7bfd6d3c (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: http://svn.digium.com/svn/asterisk/trunk@79913 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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); |