Changeset 5373

Timestamp:

Jun 30, 2016 8:23:08 AM (8 years ago)

Author:

ming

Message:

Fixed #1929: Fixed memory leak when using sip_auth_client since it's also used by other components, such as sip_dialog, publishc, and pjsua_im.

Application should use the new API pjsip_auth_clt_deinit() to release the pool.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_auth.h (modified) (1 diff)
• src/pjsip-simple/publishc.c (modified) (1 diff)
• src/pjsip-ua/sip_reg.c (modified) (2 diffs)
• src/pjsip/sip_auth_client.c (modified) (3 diffs)
• src/pjsip/sip_dialog.c (modified) (1 diff)
• src/pjsua-lib/pjsua_im.c (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_auth.h

@@ -343 +343 @@
 
 /**
+ * Deinitialize client authentication session data structure.
+ *
+ * @param sess          The client authentication session.
+ *
+ * @return              PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjsip_auth_clt_deinit( pjsip_auth_clt_sess *sess);
+
+
+/**
  * Clone client initialization session. 
  *

pjproject/trunk/pjsip/src/pjsip-simple/publishc.c

@@ -223 +223 @@
         if (pubc->mutex)
             pj_mutex_destroy(pubc->mutex);
+
+        pjsip_auth_clt_deinit(&pubc->auth_sess);
         pjsip_endpt_release_pool(pubc->endpt, pubc->pool);
     }

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

@@ -177 +177 @@
         pj_lock_release(regc->lock);
     } else {
-        pjsip_cached_auth *auth = NULL;
         pjsip_tpselector_dec_ref(&regc->tp_sel);
         if (regc->last_transport) {
@@ -192 +191 @@
         regc->lock = NULL;
 
-        auth = regc->auth_sess.cached_auth.next;
-        while (auth != &regc->auth_sess.cached_auth) {
-            pjsip_endpt_release_pool(regc->endpt, auth->pool);
-            auth = auth->next;
-        }
-
+        pjsip_auth_clt_deinit(&regc->auth_sess);
         pjsip_endpt_release_pool(regc->endpt, regc->pool);
     }

pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c

@@ -500 +500 @@
 
 
+/* Deinit client session. */
+PJ_DEF(pj_status_t) pjsip_auth_clt_deinit(pjsip_auth_clt_sess *sess)
+{
+    pjsip_cached_auth *auth;
+    
+    PJ_ASSERT_RETURN(sess && sess->endpt, PJ_EINVAL);
+    
+    auth = sess->cached_auth.next;
+    while (auth != &sess->cached_auth) {
+        pjsip_endpt_release_pool(sess->endpt, auth->pool);
+        auth = auth->next;
+    }
+
+    return PJ_SUCCESS;
+}
+
+
 /* Clone session. */
 PJ_DEF(pj_status_t) pjsip_auth_clt_clone( pj_pool_t *pool,
@@ -965 +982 @@
                                        pjsip_cached_auth *auth )
 {
-    pj_pool_t *auth_pool = pjsip_endpt_create_pool(endpt, "regc_auth%p", 1024, 
+    pj_pool_t *auth_pool = pjsip_endpt_create_pool(endpt, "auth_cli%p", 1024, 
                                                    1024);
 
@@ -1164 +1181 @@
             cached_auth = PJ_POOL_ZALLOC_T(sess->pool, pjsip_cached_auth);
             cached_auth->pool = pjsip_endpt_create_pool(sess->endpt,
-                                                        "regc_auth%p",
+                                                        "auth_cli%p",
                                                         1024,
                                                         1024);

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

@@ -120 +120 @@
         pj_bzero(&dlg->tp_sel, sizeof(pjsip_tpselector));
     }
+    pjsip_auth_clt_deinit(&dlg->auth_sess);
     pjsip_endpt_release_pool(dlg->endpt, dlg->pool);
 }

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

@@ -388 +388 @@
                 if (status == PJ_SUCCESS) {
                     /* Done */
+                    pjsip_auth_clt_deinit(&auth);
                     return;
                 }
+                pjsip_auth_clt_deinit(&auth);
             }
         }
@@ -490 +492 @@
                 if (status == PJ_SUCCESS) {
                     /* Done */
+                    pjsip_auth_clt_deinit(&auth);
                     return;
                 }
+                pjsip_auth_clt_deinit(&auth);
             }
         }