diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-19 03:06:49 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-19 03:06:49 +0000 |
| commit | 323a9be8912f801524a39e9ea3b7dde6149089e9 (patch) | |
| tree | a1543e94eb5abf9ab5f7f0f59471c0ff7cbab8ed /channels | |
| parent | 39fcf1cab3f9ca4dadaac74e0b4ca4ea524a02bb (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.0@219588 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 28e828c3b..e0a482ec8 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -9246,7 +9246,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]); |