Changeset 2157 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

Timestamp:

Jul 18, 2008 11:51:49 PM (16 years ago)

Author:

bennylp

Message:

Related to ticket #192: crash when shutting down pjsua if buddy pool has been destroyed when presence subscription callback is called

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -1094 +1094 @@
         PJ_LOG(4,(THIS_FILE, "Destroying..."));
 
+        /* Must destroy endpoint first before destroying pools in
+         * buddies or accounts, since shutting down transaction layer
+         * may emit events which trigger some buddy or account callbacks
+         * to be called.
+         */
+        pjsip_endpt_destroy(pjsua_var.endpt);
+        pjsua_var.endpt = NULL;
+
         /* Destroy pool in the buddy object */
         for (i=0; i<(int)PJ_ARRAY_SIZE(pjsua_var.buddy); ++i) {
@@ -1109 +1117 @@
             }
         }
-
-        pjsip_endpt_destroy(pjsua_var.endpt);
-        pjsua_var.endpt = NULL;
     }