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.0@219588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Russell Bryant 16 years ago
parent 2556ab814e
commit b92c592646

@ -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]);

Loading…
Cancel
Save