Merged revisions 103741 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Fri, 15 Feb 2008 23:32:18 +0000 (23:32 +0000)
committerRussell Bryant <russell@russellbryant.com>
Fri, 15 Feb 2008 23:32:18 +0000 (23:32 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r103741 | russell | 2008-02-15 17:31:39 -0600 (Fri, 15 Feb 2008) | 8 lines

Fix a crash in chan_iax2 due to a race condition

(closes issue #11780)
Reported by: guillecabeza
Patches:
      bug_iax2_jb_1.4.patch uploaded by guillecabeza (license 380)
      bug_iax2_jb_trunk.patch uploaded by guillecabeza (license 380)

........

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

channels/chan_iax2.c

index 6418d0d..6cad00c 100644 (file)
@@ -2784,7 +2784,9 @@ static int schedule_delivery(struct iax_frame *fr, int updatehistory, int fromtr
        int type, len;
        int ret;
        int needfree = 0;
-
+       struct ast_channel *owner = NULL;
+       struct ast_channel *bridge = NULL;
+       
        /* Attempt to recover wrapped timestamps */
        unwrap_timestamp(fr);
 
@@ -2815,11 +2817,12 @@ static int schedule_delivery(struct iax_frame *fr, int updatehistory, int fromtr
                return -1;
        }
 
+       if ((owner = iaxs[fr->callno]->owner))
+               bridge = ast_bridged_channel(owner);
+
        /* if the user hasn't requested we force the use of the jitterbuffer, and we're bridged to
         * a channel that can accept jitter, then flush and suspend the jb, and send this frame straight through */
-       if( (!ast_test_flag(iaxs[fr->callno], IAX_FORCEJITTERBUF)) &&
-           iaxs[fr->callno]->owner && ast_bridged_channel(iaxs[fr->callno]->owner) &&
-           (ast_bridged_channel(iaxs[fr->callno]->owner)->tech->properties & AST_CHAN_TP_WANTSJITTER)) {
+       if ( (!ast_test_flag(iaxs[fr->callno], IAX_FORCEJITTERBUF)) && owner && bridge && (bridge->tech->properties & AST_CHAN_TP_WANTSJITTER) ) {
                jb_frame frame;
 
                /* deliver any frames in the jb */