Changeset 3767 for pjproject


Ignore:
Timestamp:
Sep 22, 2011 4:24:56 AM (13 years ago)
Author:
ming
Message:

Re #1266: Fixed crash when accepting incoming call.

Location:
pjproject/trunk/pjsip
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

    r3764 r3767  
    146146        pjsip_dialog        *dlg;    /**< Call dialog.                      */ 
    147147        pjmedia_sdp_session *rem_sdp;/**< Remote SDP.                       */ 
     148        pj_pool_t           *pool_prov;/**< Provisional pool.               */ 
    148149        union { 
    149150            struct { 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

    r3763 r3767  
    15021502        /* Note: tp may be NULL if this media line is disabled */ 
    15031503        if (call_med->tp && call_med->tp_st == PJSUA_MED_TP_IDLE) { 
    1504             pj_pool_t *tmp_pool = (call->inv? call->inv->pool_prov: 
    1505                                    call->async_call.dlg->pool); 
     1504            pj_pool_t *tmp_pool = call->async_call.pool_prov; 
     1505             
     1506            if (!tmp_pool) { 
     1507                tmp_pool = (call->inv? call->inv->pool_prov: 
     1508                            call->async_call.dlg->pool); 
     1509            } 
    15061510 
    15071511            status = pjmedia_transport_media_create( 
     
    15531557 
    15541558    PJ_UNUSED_ARG(role); 
    1555     PJ_UNUSED_ARG(tmp_pool); 
    15561559 
    15571560    /* 
     
    16511654        } 
    16521655    } 
     1656 
     1657    call->async_call.pool_prov = tmp_pool; 
    16531658 
    16541659    /* Initialize each media line */ 
     
    17321737 
    17331738    if (pending_med_tp) { 
     1739        /* We shouldn't use temporary pool anymore. */ 
     1740        call->async_call.pool_prov = NULL; 
    17341741        /* We have a pending media transport initialization. */ 
    17351742        pj_log_pop_indent(); 
Note: See TracChangeset for help on using the changeset viewer.