Changeset 5969 for pjproject/trunk/pjsip/src/pjsua2/presence.cpp

Timestamp:

Apr 15, 2019 10:52:16 AM (6 years ago)

Author:

nanang

Message:

Close #2189: fixed PJSUA2 thread safety issue in list of objects manipulation.

File:

• pjproject/trunk/pjsip/src/pjsua2/presence.cpp (modified) (6 diffs)

pjproject/trunk/pjsip/src/pjsua2/presence.cpp

@@ -74 +74 @@
 
 //////////////////////////////////////////////////////////////////////////////
+typedef struct BuddyUserData
+{
+    Buddy       *self;
+    Account     *acc;
+} BuddyUserData;
 
 /*
@@ -83 +88 @@
 }
  
+Buddy::Buddy(pjsua_buddy_id buddy_id)
+: id(buddy_id)
+{
+}
+
+Buddy *Buddy::getOriginalInstance()
+{
+    BuddyUserData *bud = (BuddyUserData*)pjsua_buddy_get_user_data(id);
+    return (bud? bud->self : NULL);
+}
+
 /*
  * Destructor.
@@ -88 +104 @@
 Buddy::~Buddy()
 {
-    if (isValid()) {
+    if (isValid() && getOriginalInstance()==this) {
+        Account *acc = NULL;
+        BuddyUserData *bud = (BuddyUserData*)pjsua_buddy_get_user_data(id);
+        if (bud) {
+            acc = bud->acc;
+            delete bud;
+        }
+
         pjsua_buddy_set_user_data(id, NULL);
         pjsua_buddy_del(id);
 
         /* Remove from account buddy list */
-        acc->removeBuddy(this);
+        if (acc)
+            acc->removeBuddy(this);
     }
 }
@@ -108 +132 @@
         PJSUA2_RAISE_ERROR3(PJ_EINVAL, "Buddy::create()", "Invalid account");
     
+    BuddyUserData *bud = new BuddyUserData();
+    bud->self = this;
+    bud->acc  = &account;
+
     pj_cfg.uri = str2Pj(cfg.uri);
     pj_cfg.subscribe = cfg.subscribe;
-    pj_cfg.user_data = (void*)this;
+    pj_cfg.user_data = (void*)bud;
     PJSUA2_CHECK_EXPR( pjsua_buddy_add(&pj_cfg, &id) );
     
-    acc = &account;
-    acc->addBuddy(this);
+    account.addBuddy(this);
 }
     
@@ -161 +188 @@
 {
     BuddyInfo bi = getInfo();
+    BuddyUserData *bud = (BuddyUserData*)pjsua_buddy_get_user_data(id);
+    Account *acc = bud? bud->acc : NULL;
+
+    if (!bud || !acc || !acc->isValid()) {
+        PJSUA2_RAISE_ERROR3(PJ_EINVAL, "sendInstantMessage()",
+                            "Invalid Buddy");
+    }
 
     pj_str_t to = str2Pj(bi.contact.empty()? bi.uri : bi.contact);
@@ -180 +214 @@
 {
     BuddyInfo bi = getInfo();
+    BuddyUserData *bud = (BuddyUserData*)pjsua_buddy_get_user_data(id);
+    Account *acc = bud? bud->acc : NULL;
+
+    if (!bud || !acc || !acc->isValid()) {
+        PJSUA2_RAISE_ERROR3(PJ_EINVAL, "sendInstantMessage()",
+                            "Invalid Buddy");
+    }
 
     pj_str_t to = str2Pj(bi.contact.empty()? bi.uri : bi.contact);