Skip to content

Fix two use-after-frees #449

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

Closed
Nopey wants to merge 2 commits into from
Closed

Fix two use-after-frees #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0461f35
Fully free SocketData while removing Http_Server
Nopey Jan 23, 2026
85370b4
Fix use-after-free in openssl cert popup
Nopey Jan 23, 2026
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
10 changes: 8 additions & 2 deletions src/IO/http.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ typedef struct {
ChainLink *Info; /* Used for CCC asynchronous operations */
char *connected_to; /* Used for per-server connection limit */
uint_t connect_port;
int SKey;
Dstr *https_proxy_reply;
} SocketData_t;

Expand Down Expand Up @@ -168,7 +169,8 @@ static int Http_sock_new(void)
{
SocketData_t *S = dNew0(SocketData_t, 1);
S->SockFD = -1;
return a_Klist_insert(&ValidSocks, S);
S->SKey = a_Klist_insert(&ValidSocks, S);
return S->SKey;
}

/**
Expand Down Expand Up @@ -1092,6 +1094,8 @@ static void Http_server_remove(Server_t *srv)

while ((sd = dList_nth_data(srv->queue, 0))) {
dList_remove_fast(srv->queue, sd);
if (!(sd->flags & HTTP_SOCKET_TO_BE_FREED))
Http_socket_free(sd->SKey);
dFree(sd);
}
dList_free(srv->queue);
Expand All @@ -1108,7 +1112,9 @@ static void Http_servers_remove_all(void)
while (dList_length(servers) > 0) {
srv = (Server_t*) dList_nth_data(servers, 0);
while ((sd = dList_nth_data(srv->queue, 0))) {
dList_remove(srv->queue, sd);
dList_remove_fast(srv->queue, sd);
if (!(sd->flags & HTTP_SOCKET_TO_BE_FREED))
Http_socket_free(sd->SKey);
dFree(sd);
}
Http_server_remove(srv);
Expand Down
4 changes: 3 additions & 1 deletion src/IO/tls_openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,8 +1213,10 @@ static void Tls_connect(int fd, int connkey)
* been closed by the server if the user responded too slowly to a popup.
*/

conn = a_Klist_get_data(conn_list, connkey);

if (!ongoing) {
if (a_Klist_get_data(conn_list, connkey)) {
if (conn) {
conn->connecting = FALSE;
if (failed) {
conn->in_connect = FALSE;
Expand Down
Loading