Skip to content
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

Don't free memory not allocated by getaddrinfo(3) with freeaddrinfo #320

Merged
merged 1 commit into from
Feb 18, 2025
Merged

Don't free memory not allocated by getaddrinfo(3) with freeaddrinfo #320

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 5 deletions src/torrent/net/address_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ typedef std::unique_ptr<addrinfo, ai_deleter> ai_unique_ptr;
typedef std::unique_ptr<const addrinfo, ai_deleter> c_ai_unique_ptr;
typedef std::function<void (const sockaddr*)> ai_sockaddr_func;

inline void ai_clear(addrinfo* ai);
inline ai_unique_ptr ai_make_hint(int flags, int family, int socktype);
inline void ai_clear(addrinfo* ai);
inline std::unique_ptr<addrinfo> ai_make_hint(int flags, int family, int socktype);

int ai_get_addrinfo(const char* nodename, const char* servname, const addrinfo* hints, ai_unique_ptr& res) LIBTORRENT_EXPORT;

Expand Down Expand Up @@ -52,11 +52,11 @@ ai_clear(addrinfo* ai) {
std::memset(ai, 0, sizeof(addrinfo));
}

inline ai_unique_ptr
inline std::unique_ptr<addrinfo>
ai_make_hint(int flags, int family, int socktype) {
ai_unique_ptr aip(new addrinfo);
std::unique_ptr<addrinfo> aip(new addrinfo);

aip_clear(aip);
ai_clear(aip.get());
aip->ai_flags = flags;
aip->ai_family = family;
aip->ai_socktype = socktype;
Expand Down