diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-19 03:10:20 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-19 03:10:20 +0000 |
| commit | 7503490c649d78d65eb0c79522bb6d74a4e654fe (patch) | |
| tree | fc9ab41db58da5dfa396719dab9e08a3994e8ab8 /channels/chan_iax2.c | |
| parent | 34c80cb3ba73975829ab32b266acb0579ef7d7c8 (diff) | |
Merged revisions 219587 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r219587 | russell | 2009-09-18 21:59:52 -0500 (Fri, 18 Sep 2009) | 13 lines
Merged revisions 219586 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r219586 | russell | 2009-09-18 21:51:13 -0500 (Fri, 18 Sep 2009) | 6 lines
Make sure the iax_pvt exists before dereferencing it.
This fixes the latest crash posted on issue 15609.
(issue #15609)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@219589 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 4d9dd9ba9..bb9806b28 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -9284,7 +9284,7 @@ static int socket_process(struct iax2_thread *thread) * this connection yet. */ if ((dcallno != 1) && (fr->callno = find_callno(ntohs(mh->callno) & ~IAX_FLAG_FULL, dcallno, &sin, NEW_PREVENT, fd, 1))) { ast_mutex_lock(&iaxsl[fr->callno]); - if (ast_test_flag(iaxs[fr->callno], IAX_ENCRYPTED)) { + if (iaxs[fr->callno] && ast_test_flag(iaxs[fr->callno], IAX_ENCRYPTED)) { if (decrypt_frame(fr->callno, fh, &f, &res)) { ast_log(LOG_NOTICE, "Packet Decrypt Failed!\n"); ast_mutex_unlock(&iaxsl[fr->callno]); |