Changeset 4885 for pjproject/trunk/pjsip/src/pjsua2/call.cpp

Timestamp:

Aug 12, 2014 12:12:49 PM (10 years ago)

Author:

nanang

Message:

Misc (re #1751): Remove reference to PJSUA2 Call instance from PJSUA library in PJSUA2 Call destructor regardless the PJSUA state to avoid crash caused by accessing dangling pointer of the Call instance (thanks Thomas Steinacher for the report).

File:

• pjproject/trunk/pjsip/src/pjsua2/call.cpp (modified) (1 diff)

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

@@ -380 +380 @@
 Call::~Call()
 {
-    /**
+    /* Remove reference to this instance from PJSUA library */
+    if (id != PJSUA_INVALID_ID)
+        pjsua_call_set_user_data(id, NULL);
+
+    /*
      * If this instance is deleted, also hangup the corresponding call in
      * PJSUA library.
      */
-    if (id != PJSUA_INVALID_ID && pjsua_get_state() < PJSUA_STATE_CLOSING) {
-        pjsua_call_set_user_data(id, NULL);
-        if (isActive()) {
-            CallOpParam prm;
-            hangup(prm);
-        }
+    if (pjsua_get_state() < PJSUA_STATE_CLOSING && isActive()) {
+        CallOpParam prm;
+        hangup(prm);
     }
 }