Changeset 3767 for pjproject

Timestamp:

Sep 22, 2011 4:24:56 AM (13 years ago)

Author:

ming

Message:

Re #1266: Fixed crash when accepting incoming call.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsua-lib/pjsua_media.c (modified) (4 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -146 +146 @@
         pjsip_dialog        *dlg;    /**< Call dialog.                      */
         pjmedia_sdp_session *rem_sdp;/**< Remote SDP.                       */
+        pj_pool_t           *pool_prov;/**< Provisional pool.               */
         union {
             struct {

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1502 +1502 @@
         /* Note: tp may be NULL if this media line is disabled */
         if (call_med->tp && call_med->tp_st == PJSUA_MED_TP_IDLE) {
-            pj_pool_t *tmp_pool = (call->inv? call->inv->pool_prov:
-                                   call->async_call.dlg->pool);
+            pj_pool_t *tmp_pool = call->async_call.pool_prov;
+            
+            if (!tmp_pool) {
+                tmp_pool = (call->inv? call->inv->pool_prov:
+                            call->async_call.dlg->pool);
+            }
 
             status = pjmedia_transport_media_create(
@@ -1553 +1557 @@
 
     PJ_UNUSED_ARG(role);
-    PJ_UNUSED_ARG(tmp_pool);
 
     /*
@@ -1651 +1654 @@
         }
     }
+
+    call->async_call.pool_prov = tmp_pool;
 
     /* Initialize each media line */
@@ -1732 +1737 @@
 
     if (pending_med_tp) {
+        /* We shouldn't use temporary pool anymore. */
+        call->async_call.pool_prov = NULL;
         /* We have a pending media transport initialization. */
         pj_log_pop_indent();