kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcptls.c: Add some missing allocation failure checks.

Browse Source 
* Fix tcptls_session ref and fd leak in ast_tcptls_server_root().

Change-Id: I0ddf01cd3c10d3b6666d7bf68d4e206a37f4fbdb
This commit is contained in:
Richard Mudgett
2017-02-17 16:57:54 -06:00
parent 8851c3e088
commit 0b427f9b59
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
main/tcptls.c
View File

@@ -240,20 +240,23 @@ void *ast_tcptls_server_root(void *data)
} }
tcptls_session = ao2_alloc(sizeof(*tcptls_session), session_instance_destructor); tcptls_session = ao2_alloc(sizeof(*tcptls_session), session_instance_destructor);
if (!tcptls_session) { if (!tcptls_session) {
ast_log(LOG_WARNING, "No memory for new session: %s\n", strerror(errno)); close(fd);
if (close(fd)) {
ast_log(LOG_ERROR, "close() failed: %s\n", strerror(errno));
}
continue; continue;
} }
tcptls_session->overflow_buf = ast_str_create(128); tcptls_session->overflow_buf = ast_str_create(128);
if (!tcptls_session->overflow_buf) {
ao2_ref(tcptls_session, -1);
close(fd);
continue;
}
flags = fcntl(fd, F_GETFL); flags = fcntl(fd, F_GETFL);
fcntl(fd, F_SETFL, flags & ~O_NONBLOCK); fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
tcptls_session->stream = ast_iostream_from_fd(&fd); tcptls_session->stream = ast_iostream_from_fd(&fd);
if (!tcptls_session->stream) { if (!tcptls_session->stream) {
ast_log(LOG_WARNING, "No memory for new session iostream\n"); ao2_ref(tcptls_session, -1);
close(fd);
continue; continue;
} }
@@ -265,7 +268,6 @@ void *ast_tcptls_server_root(void *data)
/* This thread is now the only place that controls the single ref to tcptls_session */ /* This thread is now the only place that controls the single ref to tcptls_session */
if (ast_pthread_create_detached_background(&launched, NULL, handle_tcptls_connection, tcptls_session)) { if (ast_pthread_create_detached_background(&launched, NULL, handle_tcptls_connection, tcptls_session)) {
ast_log(LOG_ERROR, "Unable to launch helper thread: %s\n", strerror(errno)); ast_log(LOG_ERROR, "Unable to launch helper thread: %s\n", strerror(errno));
ast_tcptls_close_session_file(tcptls_session);
ao2_ref(tcptls_session, -1); ao2_ref(tcptls_session, -1);
} }
} }
@@ -561,11 +563,15 @@ struct ast_tcptls_session_instance *ast_tcptls_client_create(struct ast_tcptls_s
} }
} }
if (!(tcptls_session = ao2_alloc(sizeof(*tcptls_session), session_instance_destructor))) { tcptls_session = ao2_alloc(sizeof(*tcptls_session), session_instance_destructor);
if (!tcptls_session) {
goto error; goto error;
} }
tcptls_session->overflow_buf = ast_str_create(128); tcptls_session->overflow_buf = ast_str_create(128);
if (!tcptls_session->overflow_buf) {
goto error;
}
tcptls_session->client = 1; tcptls_session->client = 1;
tcptls_session->stream = ast_iostream_from_fd(&fd); tcptls_session->stream = ast_iostream_from_fd(&fd);
if (!tcptls_session->stream) { if (!tcptls_session->stream) {
@@ -584,9 +590,7 @@ struct ast_tcptls_session_instance *ast_tcptls_client_create(struct ast_tcptls_s
error: error:
close(desc->accept_fd); close(desc->accept_fd);
desc->accept_fd = -1; desc->accept_fd = -1;
if (tcptls_session) { ao2_cleanup(tcptls_session);
ao2_ref(tcptls_session, -1);
}
return NULL; return NULL;
} }