[asterisk-commits] russell: branch 1.6.0 r219588 - in /branches/1.6.0: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Sep 18 22:06:49 2009
New Revision: 219588

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=219588
Log:
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)
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_iax2.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=219588&r1=219587&r2=219588
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Fri Sep 18 22:06:49 2009
@@ -9246,7 +9246,7 @@
 		 * 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]);