Changeset 5949

Timestamp:

Mar 8, 2019 9:29:09 AM (6 years ago)

Author:

ming

Message:

Fixed #2182: Prevent crash in unpublishing presence when deleting account

Note that this fix only covers the account deletion scenario. It doesn't prevent the race condition between deleting account in publish_cb and accessing the publish session itself, which should be solved using a locking mechanism.

Thanks to Bogdan Bogdan Chifor for the report.

File:

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

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

@@ -1392 +1392 @@
 
         acc->online_status = PJ_FALSE;
+        acc_cfg->publish_enabled = PJ_FALSE;
 
         if ((flags & PJSUA_DESTROY_NO_TX_MSG) == 0) {
@@ -1404 +1405 @@
         }
         */
-        acc_cfg->publish_enabled = PJ_FALSE;
     }
 }
@@ -1450 +1450 @@
 
     /* Terminate presence publication, if any */
-    pjsua_pres_unpublish(acc, flags);
+    if (acc->cfg.publish_enabled)
+        pjsua_pres_unpublish(acc, flags);
 }