Changeset 2134

Timestamp:

Jul 14, 2008 9:55:01 AM (16 years ago)

Author:

bennylp

Message:

Related to ticket #518: only destroy the account and buddy pools after busy_sleep() is done, otherwise when unregistration callback is called, the callback will access accounts which are no longer valid because the pool has been destroyed

File:

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

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

@@ -1070 +1070 @@
         pjsua_pres_shutdown();
 
-        /* Destroy pool in the buddy object */
-        for (i=0; i<(int)PJ_ARRAY_SIZE(pjsua_var.buddy); ++i) {
-            if (pjsua_var.buddy[i].pool) {
-                pj_pool_release(pjsua_var.buddy[i].pool);
-                pjsua_var.buddy[i].pool = NULL;
-            }
-        }
-
-        /* Destroy accounts */
+        /* Unregister all accounts */
         for (i=0; i<(int)PJ_ARRAY_SIZE(pjsua_var.acc); ++i) {
             if (!pjsua_var.acc[i].valid)
@@ -1085 +1077 @@
             if (pjsua_var.acc[i].regc) {
                 pjsua_acc_set_registration(i, PJ_FALSE);
-            }
-
-            if (pjsua_var.acc[i].pool) {
-                pj_pool_release(pjsua_var.acc[i].pool);
-                pjsua_var.acc[i].pool = NULL;
             }
         }
@@ -1104 +1091 @@
         PJ_LOG(4,(THIS_FILE, "Shutting down..."));
         busy_sleep(1000);
+
+        PJ_LOG(4,(THIS_FILE, "Destroying..."));
+
+        /* Destroy pool in the buddy object */
+        for (i=0; i<(int)PJ_ARRAY_SIZE(pjsua_var.buddy); ++i) {
+            if (pjsua_var.buddy[i].pool) {
+                pj_pool_release(pjsua_var.buddy[i].pool);
+                pjsua_var.buddy[i].pool = NULL;
+            }
+        }
+
+        /* Destroy accounts */
+        for (i=0; i<(int)PJ_ARRAY_SIZE(pjsua_var.acc); ++i) {
+            if (pjsua_var.acc[i].pool) {
+                pj_pool_release(pjsua_var.acc[i].pool);
+                pjsua_var.acc[i].pool = NULL;
+            }
+        }
 
         pjsip_endpt_destroy(pjsua_var.endpt);