From: David Vossel Date: Thu, 24 Sep 2009 20:37:20 +0000 (+0000) Subject: fixes tcptls_session memory leak caused by ref count error X-Git-Tag: 11.0.0-beta1~4129 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90746d26f3711dc3f4a022de28b0af38c92fc89e;p=thirdparty%2Fasterisk.git fixes tcptls_session memory leak caused by ref count error (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 --- diff --git a/main/tcptls.c b/main/tcptls.c index e51d7a208a..e92209b3c4 100644 --- a/main/tcptls.c +++ b/main/tcptls.c @@ -122,6 +122,8 @@ static void session_instance_destructor(void *obj) * creates a FILE * from the fd passed by the accept thread. * This operation is potentially expensive (certificate verification), * 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) { @@ -196,6 +198,7 @@ static void *handle_tls_connection(void *data) if (peer) X509_free(peer); fclose(tcptls_session->f); + ao2_ref(tcptls_session, -1); return NULL; } } @@ -262,6 +265,7 @@ void *ast_tcptls_server_root(void *data) 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)) { ast_log(LOG_WARNING, "Unable to launch helper thread: %s\n", strerror(errno)); 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); } - ao2_ref(tcptls_session, +1); - if (!handle_tls_connection(tcptls_session)) + /* handle_tls_connection controls the single ref to tcptls_session. If + * tcptls_session returns NULL then the session has been destroyed */ + if (!(tcptls_session = handle_tls_connection(tcptls_session))) goto error; return tcptls_session;