kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes tcptls_session memory leak caused by ref count error

Browse Source 
(closes issue #15939)
Reported by: dvossel

Review: https://reviewboard.asterisk.org/r/375/



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@220365 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2009-09-24 20:37:20 +00:00
parent f150b48bc0
commit 90746d26f3
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/tcptls.c
View File

@@ -122,6 +122,8 @@ static void session_instance_destructor(void *obj)
* creates a FILE * from the fd passed by the accept thread. * creates a FILE * from the fd passed by the accept thread.
* This operation is potentially expensive (certificate verification), * This operation is potentially expensive (certificate verification),
* so we do it in the child thread context. * so we do it in the child thread context.
*
* \note must decrement ref count before returning NULL on error
*/ */
static void *handle_tls_connection(void *data) static void *handle_tls_connection(void *data)
{ {
@@ -196,6 +198,7 @@ static void *handle_tls_connection(void *data)
if (peer) if (peer)
X509_free(peer); X509_free(peer);
fclose(tcptls_session->f); fclose(tcptls_session->f);
ao2_ref(tcptls_session, -1);
return NULL; return NULL;
} }
} }
@@ -262,6 +265,7 @@ void *ast_tcptls_server_root(void *data)
tcptls_session->client = 0; tcptls_session->client = 0;
/* This thread is now the only place that controls the single ref to tcptls_session */
if (ast_pthread_create_detached_background(&launched, NULL, handle_tls_connection, tcptls_session)) { if (ast_pthread_create_detached_background(&launched, NULL, handle_tls_connection, tcptls_session)) {
ast_log(LOG_WARNING, "Unable to launch helper thread: %s\n", strerror(errno)); ast_log(LOG_WARNING, "Unable to launch helper thread: %s\n", strerror(errno));
close(tcptls_session->fd); close(tcptls_session->fd);
@@ -418,8 +422,9 @@ struct ast_tcptls_session_instance *ast_tcptls_client_start(struct ast_tcptls_se
__ssl_setup(desc->tls_cfg, 1); __ssl_setup(desc->tls_cfg, 1);
} }
ao2_ref(tcptls_session, +1); /* handle_tls_connection controls the single ref to tcptls_session. If
if (!handle_tls_connection(tcptls_session)) * tcptls_session returns NULL then the session has been destroyed */
if (!(tcptls_session = handle_tls_connection(tcptls_session)))
goto error; goto error;
return tcptls_session; return tcptls_session;