Changeset 5401

Timestamp:

Jul 28, 2016 8:21:45 AM (8 years ago)

Author:

nanang

Message:

Fix #1946: Avoid deinitialization of uninitialized client auth session.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_dialog.c (modified) (3 diffs)

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

@@ -93 +93 @@
     pj_list_init(&dlg->rem_cap_hdr);
 
+    /* Init client authentication session. */
+    status = pjsip_auth_clt_init(&dlg->auth_sess, dlg->endpt,
+                                 dlg->pool, 0);
+    if (status != PJ_SUCCESS)
+        goto on_error;
+
     status = pj_mutex_create_recursive(pool, dlg->obj_name, &dlg->mutex_);
     if (status != PJ_SUCCESS)
@@ -283 +289 @@
     /* Initial route set is empty. */
     pj_list_init(&dlg->route_set);
-
-    /* Init client authentication session. */
-    status = pjsip_auth_clt_init(&dlg->auth_sess, dlg->endpt,
-                                 dlg->pool, 0);
-    if (status != PJ_SUCCESS)
-        goto on_error;
 
     /* Register this dialog to user agent. */
@@ -506 +506 @@
     }
     dlg->route_set_frozen = PJ_TRUE;
-
-    /* Init client authentication session. */
-    status = pjsip_auth_clt_init(&dlg->auth_sess, dlg->endpt,
-                                 dlg->pool, 0);
-    if (status != PJ_SUCCESS)
-        goto on_error;
 
     /* Increment the dialog's lock since tsx may cause the dialog to be