Changeset 5316

Timestamp:

May 25, 2016 5:25:12 AM (8 years ago)

Author:

nanang

Message:

Fix #1924: Put check whether dialog has been registered to pjsip UA before calling pjsip_ua_unregister_dlg() to avoid assertion.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_dialog.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -788 +788 @@
     PJ_ASSERT_RETURN(dlg->tsx_count==0, PJ_EINVALIDOP);
 
-    /* Unregister from user agent. */
-    status = pjsip_ua_unregister_dlg(dlg->ua, dlg);
-    if (status != PJ_SUCCESS) {
-        pj_assert(!"Unexpected failed unregistration!");
-        return status;
+    /* Unregister from user agent, if it has been registered (see #1924) */
+    if (dlg->dlg_set) {
+        status = pjsip_ua_unregister_dlg(dlg->ua, dlg);
+        if (status != PJ_SUCCESS) {
+            pj_assert(!"Unexpected failed unregistration!");
+            return status;
+        }
     }