From 386ac445589e173e4437152b3a818490302e33ee Mon Sep 17 00:00:00 2001 From: stone Date: Sun, 23 Jan 2022 07:18:16 +0800 Subject: [PATCH] bugfix: SrsAutoFree addrinfo (#2886) * bugfix: SrsAutoFree addrinfo * bugfix: SrsAutoFreeH(addrinfo, r, freeaddrinfo) Co-authored-by: wanglei --- trunk/src/kernel/srs_kernel_utility.cpp | 2 +- trunk/src/protocol/srs_service_st.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/trunk/src/kernel/srs_kernel_utility.cpp b/trunk/src/kernel/srs_kernel_utility.cpp index 8d59cbc9d..33ca2d1f1 100644 --- a/trunk/src/kernel/srs_kernel_utility.cpp +++ b/trunk/src/kernel/srs_kernel_utility.cpp @@ -155,7 +155,7 @@ string srs_dns_resolve(string host, int& family) hints.ai_family = family; addrinfo* r = NULL; - SrsAutoFree(addrinfo, r); + SrsAutoFreeH(addrinfo, r, freeaddrinfo); if(getaddrinfo(host.c_str(), NULL, &hints, &r)) { return ""; } diff --git a/trunk/src/protocol/srs_service_st.cpp b/trunk/src/protocol/srs_service_st.cpp index b4e295377..8e1fe4455 100644 --- a/trunk/src/protocol/srs_service_st.cpp +++ b/trunk/src/protocol/srs_service_st.cpp @@ -171,7 +171,7 @@ srs_error_t srs_tcp_connect(string server, int port, srs_utime_t tm, srs_netfd_t hints.ai_socktype = SOCK_STREAM; addrinfo* r = NULL; - SrsAutoFree(addrinfo, r); + SrsAutoFreeH(addrinfo, r, freeaddrinfo); if(getaddrinfo(server.c_str(), sport, (const addrinfo*)&hints, &r)) { return srs_error_new(ERROR_SYSTEM_IP_INVALID, "get address info"); } @@ -248,7 +248,7 @@ srs_error_t srs_tcp_listen(std::string ip, int port, srs_netfd_t* pfd) hints.ai_flags = AI_NUMERICHOST; addrinfo* r = NULL; - SrsAutoFreeF(addrinfo, r); + SrsAutoFreeH(addrinfo, r, freeaddrinfo); if(getaddrinfo(ip.c_str(), sport, (const addrinfo*)&hints, &r)) { return srs_error_new(ERROR_SYSTEM_IP_INVALID, "getaddrinfo hints=(%d,%d,%d)", hints.ai_family, hints.ai_socktype, hints.ai_flags); @@ -309,7 +309,7 @@ srs_error_t srs_udp_listen(std::string ip, int port, srs_netfd_t* pfd) hints.ai_flags = AI_NUMERICHOST; addrinfo* r = NULL; - SrsAutoFree(addrinfo, r); + SrsAutoFreeH(addrinfo, r, freeaddrinfo); if(getaddrinfo(ip.c_str(), sport, (const addrinfo*)&hints, &r)) { return srs_error_new(ERROR_SYSTEM_IP_INVALID, "getaddrinfo hints=(%d,%d,%d)", hints.ai_family, hints.ai_socktype, hints.ai_flags);