Changeset 3768 for pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Sep 22, 2011 6:13:22 AM (13 years ago)

Author:

bennylp

Message:

Fixed #1376: Crash if pjsua_call_get_info() is called with disconnected call

File:

• pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_call.c (modified) (3 diffs)

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_call.c

@@ -1242 +1242 @@
 {
     pjsua_call *call;
-    pjsua_conf_port_id port_id;
+    pjsua_conf_port_id port_id = PJSUA_INVALID_ID;
 
     PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls, 
@@ -1252 +1252 @@
     PJSUA_LOCK();
 
+    if (!pjsua_call_is_active(call_id))
+        goto on_return;
+
     call = &pjsua_var.calls[call_id];
     port_id = call->conf_slot;
 
+on_return:
     PJSUA_UNLOCK();
 
@@ -1279 +1283 @@
      */
     PJSUA_LOCK();
+
+    if (!pjsua_call_is_active(call_id)) {
+        PJSUA_UNLOCK();
+        return PJSIP_ESESSIONTERMINATED;
+    }
 
     call = &pjsua_var.calls[call_id];