Merged revisions 96394 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 3 Jan 2008 22:46:37 +0000 (22:46 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 3 Jan 2008 22:46:37 +0000 (22:46 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r96394 | russell | 2008-01-03 16:44:22 -0600 (Thu, 03 Jan 2008) | 3 lines

Don't crash if the iax2 pvt structure has been destroyed before we get to this point
(closes issue #11672, reported by snuffy, patched by me)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@96395 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_iax2.c

index 3aebc4f..35107fa 100644 (file)
@@ -9053,11 +9053,11 @@ retryowner2:
        iax_frame_wrap(fr, &f);
 
        /* If this is our most recent packet, use it as our basis for timestamping */
-       if (iaxs[fr->callno]->last < fr->ts) {
+       if (iaxs[fr->callno] && iaxs[fr->callno]->last < fr->ts) {
                /*iaxs[fr->callno]->last = fr->ts; (do it afterwards cos schedule/forward_delivery needs the last ts too)*/
                fr->outoforder = 0;
        } else {
-               if (iaxdebug)
+               if (iaxdebug && iaxs[fr->callno])
                        ast_debug(1, "Received out of order packet... (type=%d, subclass %d, ts = %d, last = %d)\n", f.frametype, f.subclass, fr->ts, iaxs[fr->callno]->last);
                fr->outoforder = -1;
        }