Skip to content

Add null checks for http_load #7995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shinrich merged 2 commits into from
Jun 28, 2021
Merged

Add null checks for http_load #7995

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3adfae3
Add null checks for http_load
shinrich Jun 25, 2021
638d590
Actually close up and return in the error case
shinrich Jun 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion tools/http_load/http_load.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,6 +1164,12 @@ handle_connect(int cnum, struct timeval *nowP, int double_check)
SSL_load_error_strings();
SSL_library_init();
ssl_ctx = SSL_CTX_new(SSLv23_client_method());
if (ssl_ctx == NULL) {
(void)fprintf(stderr, "%s: failed to create SSL_CTX\n", argv0);
ERR_print_errors_fp(stderr);
return;
}

/* For some reason this does not seem to work, but indications are that it should...
Maybe something with how we create connections? TODO: Fix it... */
SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_NONE, cert_verify_callback);
Expand All @@ -1187,6 +1193,12 @@ handle_connect(int cnum, struct timeval *nowP, int double_check)
if (flags != -1)
(void)fcntl(connections[cnum].conn_fd, F_SETFL, flags & ~(int)O_NDELAY);
connections[cnum].ssl = SSL_new(ssl_ctx);
if (connections[cnum].ssl == NULL) {
(void)fprintf(stderr, "%s: failed to create SSL\n", argv0);
ERR_print_errors_fp(stderr);
close_connection(cnum);
return;
}
SSL_set_fd(connections[cnum].ssl, connections[cnum].conn_fd);
r = SSL_connect(connections[cnum].ssl);
if (r <= 0) {
Expand Down Expand Up @@ -2802,7 +2814,7 @@ close_connection(int cnum)
ev.data.u32 = cnum;
if (epoll_ctl(epfd, EPOLL_CTL_DEL, connections[cnum].conn_fd, &ev) < 0)
perror("epoll delete fd");
if (urls[connections[cnum].url_num].protocol == PROTO_HTTPS)
if (urls[connections[cnum].url_num].protocol == PROTO_HTTPS && connections[cnum].ssl != NULL)
SSL_free(connections[cnum].ssl);
(void)close(connections[cnum].conn_fd);
} else {
Expand Down