Changeset 3508

Timestamp:

Apr 7, 2011 2:51:28 PM (14 years ago)

Author:

nanang

Message:

Re #1201: Fixed crash when remote initiate call hold with SDP media connection address "0.0.0.0".

File:

• pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_call.c (modified) (3 diffs)

pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_call.c

@@ -3851 +3851 @@
 {
     pjsua_call *call;
-    pjmedia_sdp_conn *conn = NULL;
     pjmedia_sdp_session *answer;
+    unsigned i;
     pj_status_t status;
 
@@ -3858 +3858 @@
 
     call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
-
-    if (call->audio_idx < (int)offer->media_count)
-        conn = offer->media[call->audio_idx]->conn;
-
-    if (!conn)
-        conn = offer->conn;
 
     /* Supply candidate answer */
@@ -3878 +3872 @@
     }
 
+    /* Validate media count in the generated answer */
+    pj_assert(answer->media_count == offer->media_count);
+
     /* Check if offer's conn address is zero */
-    if (pj_strcmp2(&conn->addr, "0.0.0.0")==0 ||
-        pj_strcmp2(&conn->addr, "0")==0)
-    {
-        /* Modify address */
-        answer->conn->addr = pj_str("0.0.0.0");
+    for (i = 0; i < answer->media_count; ++i) {
+        pjmedia_sdp_conn *conn;
+
+        conn = offer->media[i]->conn;
+        if (!conn)
+            conn = offer->conn;
+
+        if (pj_strcmp2(&conn->addr, "0.0.0.0")==0 ||
+            pj_strcmp2(&conn->addr, "0")==0)
+        {
+            pjmedia_sdp_conn *a_conn = answer->media[i]->conn;
+
+            /* Modify answer address */
+            if (a_conn) {
+                a_conn->addr = pj_str("0.0.0.0");
+            } else if (answer->conn == NULL ||
+                       pj_strcmp2(&answer->conn->addr, "0.0.0.0") != 0)
+            {
+                a_conn = PJ_POOL_ZALLOC_T(call->inv->pool_prov,
+                                          pjmedia_sdp_conn);
+                a_conn->net_type = pj_str("IN");
+                a_conn->addr_type = pj_str("IP4");
+                a_conn->addr = pj_str("0.0.0.0");
+                answer->media[i]->conn = a_conn;
+            }
+        }
     }