Changeset 4379 for pjproject/branches/1.x

Timestamp:

Feb 27, 2013 9:54:51 AM (12 years ago)

Author:

nanang

Message:

Re #1535: backported to 1.x

Location:

pjproject/branches/1.x

Files:

• . (modified) (1 prop)
• pjsip/src/pjsip/sip_transaction.c (modified) (1 diff)
• pjsip/src/pjsip/sip_util_statefull.c (modified) (1 diff)

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

@@ -1715 +1715 @@
     /* Check if transaction has cancelled itself from this transmit
      * notification (https://trac.pjsip.org/repos/ticket/1033).
-     */
-    if (tdata->mod_data[mod_tsx_layer.mod.id] == NULL) {
+     * Also check if the transaction layer itself may have been shutdown
+     * (https://trac.pjsip.org/repos/ticket/1535)
+     */
+    if (mod_tsx_layer.mod.id < 0 ||
+        tdata->mod_data[mod_tsx_layer.mod.id] == NULL)
+    {
         *cont = PJ_FALSE;
         return;

pjproject/branches/1.x/pjsip/src/pjsip/sip_util_statefull.c

@@ -60 +60 @@
     struct tsx_data *tsx_data;
 
-    if (event->type != PJSIP_EVENT_TSX_STATE)
+    /* Check if the module has been unregistered (see ticket #1535) and also
+     * verify the event type.
+     */
+    if (mod_stateful_util.id < 0 || event->type != PJSIP_EVENT_TSX_STATE)
         return;