Changeset 2811 for pjproject/branches/1.0/pjsip/src/pjsua-lib/pjsua_pres.c

Timestamp:

Jun 25, 2009 1:01:06 PM (15 years ago)

Author:

bennylp

Message:

Ticket #787: Crash when UAC invite or subscribe session initialization fails (thanks Rostislav Molodyko for the report)

• backported changes from #786

File:

• pjproject/branches/1.0/pjsip/src/pjsua-lib/pjsua_pres.c (modified) (5 diffs)

pjproject/branches/1.0/pjsip/src/pjsua-lib/pjsua_pres.c

@@ -1443 +1443 @@
     }
 
+    /* Increment the dialog's lock otherwise when presence session creation
+     * fails the dialog will be destroyed prematurely.
+     */
+    pjsip_dlg_inc_lock(buddy->dlg);
+
     status = pjsip_pres_create_uac( buddy->dlg, &pres_callback, 
                                     PJSIP_EVSUB_NO_EVENT_ID, &buddy->sub);
@@ -1449 +1454 @@
         pjsua_perror(THIS_FILE, "Unable to create presence client", 
                      status);
-        pjsip_dlg_terminate(buddy->dlg);
+        /* This should destroy the dialog since there's no session
+         * referencing it
+         */
+        pjsip_dlg_dec_lock(buddy->dlg);
         if (tmp_pool) pj_pool_release(tmp_pool);
         return;
@@ -1482 +1490 @@
     status = pjsip_pres_initiate(buddy->sub, -1, &tdata);
     if (status != PJ_SUCCESS) {
+        pjsip_dlg_dec_lock(buddy->dlg);
         if (buddy->sub) {
             pjsip_pres_terminate(buddy->sub, PJ_FALSE);
@@ -1496 +1505 @@
     status = pjsip_pres_send_request(buddy->sub, tdata);
     if (status != PJ_SUCCESS) {
+        pjsip_dlg_dec_lock(buddy->dlg);
         if (buddy->sub) {
             pjsip_pres_terminate(buddy->sub, PJ_FALSE);
@@ -1506 +1516 @@
     }
 
+    pjsip_dlg_dec_lock(buddy->dlg);
     if (tmp_pool) pj_pool_release(tmp_pool);
 }