Changeset 4379


Ignore:
Timestamp:
Feb 27, 2013 9:54:51 AM (6 years ago)
Author:
nanang
Message:

Re #1535: backported to 1.x

Location:
pjproject/branches/1.x
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/1.x

  • pjproject/branches/1.x/pjsip/src/pjsip/sip_transaction.c

    r3989 r4379  
    17151715    /* Check if transaction has cancelled itself from this transmit 
    17161716     * notification (https://trac.pjsip.org/repos/ticket/1033). 
    1717      */ 
    1718     if (tdata->mod_data[mod_tsx_layer.mod.id] == NULL) { 
     1717     * Also check if the transaction layer itself may have been shutdown 
     1718     * (https://trac.pjsip.org/repos/ticket/1535) 
     1719     */ 
     1720    if (mod_tsx_layer.mod.id < 0 || 
     1721        tdata->mod_data[mod_tsx_layer.mod.id] == NULL) 
     1722    { 
    17191723        *cont = PJ_FALSE; 
    17201724        return; 
  • pjproject/branches/1.x/pjsip/src/pjsip/sip_util_statefull.c

    r3553 r4379  
    6060    struct tsx_data *tsx_data; 
    6161 
    62     if (event->type != PJSIP_EVENT_TSX_STATE) 
     62    /* Check if the module has been unregistered (see ticket #1535) and also 
     63     * verify the event type. 
     64     */ 
     65    if (mod_stateful_util.id < 0 || event->type != PJSIP_EVENT_TSX_STATE) 
    6366        return; 
    6467 
Note: See TracChangeset for help on using the changeset viewer.