Changeset 3091

Timestamp:

Feb 9, 2010 12:28:03 PM (13 years ago)

Author:

bennylp

Message:

Fixed ticket #1034: Crash on accepting a call with no codec in the SDP offer

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -245 +245 @@
         /* Release the flip-flop pools */
         pj_pool_release(inv->pool_prov);
+        inv->pool_prov = NULL;
         pj_pool_release(inv->pool_active);
+        inv->pool_active = NULL;
     }
 }
@@ -1499 +1501 @@
         (*mod_inv.cb.on_media_update)(inv, status);
 
-    /* Swap the flip-flop pool when SDP negotiation success. */
-    if (status == PJ_SUCCESS) {
-        swap_pool(&inv->pool_prov, &inv->pool_active);
-    }
-
-    /* Reset the provisional pool regardless SDP negotiation result. */
-    pj_pool_reset(inv->pool_prov);
+    /* Invite session may have been terminated by the application even 
+     * after a successful SDP negotiation, for example when no audio 
+     * codec is present in the offer (see ticket #1034).
+     */
+    if (inv->state != PJSIP_INV_STATE_DISCONNECTED) {
+
+        /* Swap the flip-flop pool when SDP negotiation success. */
+        if (status == PJ_SUCCESS) {
+            swap_pool(&inv->pool_prov, &inv->pool_active);
+        }
+
+        /* Reset the provisional pool regardless SDP negotiation result. */
+        pj_pool_reset(inv->pool_prov);
+
+    } else {
+
+        status = PJSIP_ERRNO_FROM_SIP_STATUS(inv->cause);
+    }
 
     return status;