Skip to content

Fix asyn-thread HTTPS resolution and a memory leak in asyn-ares #16107

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
Fullmetal5 wants to merge 2 commits into from
Closed

Fix asyn-thread HTTPS resolution and a memory leak in asyn-ares #16107

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
ea7a7c9
asyn-thread: fix HTTPS RR resolution
Fullmetal5 Jan 28, 2025
3bf32d0
asyn-ares: fix memory leak
Fullmetal5 Jan 28, 2025
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
5 changes: 3 additions & 2 deletions lib/asyn-ares.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,8 +435,9 @@ CURLcode Curl_resolver_is_resolved(struct Curl_easy *data,
struct Curl_https_rrinfo *lhrr =
Curl_memdup(&res->hinfo, sizeof(struct Curl_https_rrinfo));
if(!lhrr)
return CURLE_OUT_OF_MEMORY;
(*dns)->hinfo = lhrr;
result = CURLE_OUT_OF_MEMORY;
else
(*dns)->hinfo = lhrr;
}
#endif
}
Expand Down
12 changes: 12 additions & 0 deletions lib/asyn-thread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
#include "inet_ntop.h"
#include "curl_threads.h"
#include "connect.h"
#include "strdup.h"

#ifdef USE_ARES
#include <ares.h>
Expand Down Expand Up @@ -619,6 +620,17 @@ CURLcode Curl_resolver_is_resolved(struct Curl_easy *data,
destroy_async_data(&data->state.async);
return result;
}
#ifdef USE_HTTPSRR_ARES
{
struct Curl_https_rrinfo *lhrr =
Curl_memdup(&td->hinfo, sizeof(struct Curl_https_rrinfo));
if(!lhrr) {
destroy_async_data(&data->state.async);
return CURLE_OUT_OF_MEMORY;
}
data->state.async.dns->hinfo = lhrr;
}
#endif
destroy_async_data(&data->state.async);
*entry = data->state.async.dns;
}
Expand Down
Loading