From: Russell Bryant <russell@russellbryant.com>
Date: Sat, 19 Sep 2009 03:10:20 +0000 (+0000)
Subject: Merged revisions 219587 via svnmerge from
X-Git-Tag: 1.6.1.7-rc2~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27f242d63af150c2980e18082207595e023874ff;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@219589 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 4d9dd9ba9c..bb9806b28f 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]);