aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_zap.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-08-17 21:01:43 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-08-17 21:01:43 +0000
commit5ce9a719de199ead11519342f4e77ab2e1bd466d (patch)
treeb8095b170f1ca22e42691cbe8e952786debaca0f /channels/chan_zap.c
parentd8b9ecad9e603ec76ad50d47356e966db46a0c52 (diff)
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/branches/1.4@79912 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
-rw-r--r--channels/chan_zap.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index d20596dbd..6c0967081 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -6111,6 +6111,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_log(LOG_DEBUG, "CID got digit '%c'\n", f->subclass);