aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-19 03:14:27 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-19 03:14:27 +0000
commit0d8b1b60ac35de8319c240f58c10f934d5c9b262 (patch)
treeba1682069b47e0a4cbbc0229705f29ad4734434a
parentd447742f5a331c4408b841efe8c21a2e3d160ced (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.2@219590 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_iax2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 0116d7c5d..d09e46baf 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -9448,7 +9448,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]);