Changeset 6074 for pjproject/trunk/pjsip/src/pjsua2/account.cpp

Timestamp:

Sep 23, 2019 10:47:05 PM (4 years ago)

Author:

riza

Message:

Close #2232: Crash on Endpoint::libDestroy() when there is an active call.

File:

• pjproject/trunk/pjsip/src/pjsua2/account.cpp (modified) (7 diffs)

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

@@ -968 +968 @@
 {
     if (isValid() && pjsua_get_state() < PJSUA_STATE_CLOSING) {
+#if !DEPRECATED_FOR_TICKET_2232
         // Cleanup buddies in the buddy list
         while(buddyList.size() > 0) {
@@ -973 +974 @@
             delete b; /* this will remove itself from the list */
         }
+#endif
 
         // This caused error message of "Error: cannot find Account.."
@@ -1065 +1067 @@
 }
 
+#if !DEPRECATED_FOR_TICKET_2232
 const BuddyVector& Account::enumBuddies() const PJSUA2_THROW(Error)
 {
     return buddyList;
 }
+#endif
 
 BuddyVector2 Account::enumBuddies2() const PJSUA2_THROW(Error)
@@ -1084 +1088 @@
 }
 
+#if !DEPRECATED_FOR_TICKET_2232
 Buddy* Account::findBuddy(string uri, FindBuddyMatch *buddy_match) const
                 PJSUA2_THROW(Error)
@@ -1098 +1103 @@
     PJSUA2_RAISE_ERROR(PJ_ENOTFOUND);
 }
+#endif
 
 Buddy Account::findBuddy2(string uri) const PJSUA2_THROW(Error)
@@ -1117 +1123 @@
 void Account::addBuddy(Buddy *buddy)
 {
+#if !DEPRECATED_FOR_TICKET_2232
     pj_assert(buddy);
 
     buddyList.push_back(buddy);
+#else
+    PJ_UNUSED_ARG(buddy);
+#endif
 }
 
 void Account::removeBuddy(Buddy *buddy)
 {
+#if !DEPRECATED_FOR_TICKET_2232
     pj_assert(buddy);
 
@@ -1135 +1146 @@
 
     pj_assert(!"Bug! Buddy to be removed is not in the buddy list!");
-}
+#else
+    PJ_UNUSED_ARG(buddy);
+#endif
+}