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

Merge "tcptls.c: Add some missing allocation failure checks." into 13

Browse Source
This commit is contained in:
zuul
2017-02-20 21:30:28 -06:00
committed by Gerrit Code Review
parent 8287a012b6 096496e13e
commit 557ef67690
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
main/tcptls.c
View File

@@ -773,14 +773,16 @@ 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->fd = fd; tcptls_session->fd = fd;
@@ -1059,11 +1061,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->fd = desc->accept_fd; tcptls_session->fd = desc->accept_fd;
tcptls_session->parent = desc; tcptls_session->parent = desc;
@@ -1078,9 +1084,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;
} }