external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

bugfix: SrsAutoFree addrinfo (#2886)

Browse source 
* bugfix: SrsAutoFree addrinfo

* bugfix: SrsAutoFreeH(addrinfo, r, freeaddrinfo)

Co-authored-by: wanglei <wanglei@unicloud.com>
This commit is contained in:
stone 2022-01-23 07:18:16 +08:00 • committed by GitHub
parent 92434cfeba
commit 386ac44558
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/kernel/srs_kernel_utility.cpp
View file

@ -155,7 +155,7 @@ string srs_dns_resolve(string host, int& family)
hints.ai_family = family; hints.ai_family = family;
addrinfo* r = NULL; addrinfo* r = NULL;
SrsAutoFree(addrinfo, r); SrsAutoFreeH(addrinfo, r, freeaddrinfo);
if(getaddrinfo(host.c_str(), NULL, &hints, &r)) { if(getaddrinfo(host.c_str(), NULL, &hints, &r)) {
return ""; return "";
} }

6
trunk/src/protocol/srs_service_st.cpp
View file

@ -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; hints.ai_socktype = SOCK_STREAM;
addrinfo* r = NULL; addrinfo* r = NULL;
SrsAutoFree(addrinfo, r); SrsAutoFreeH(addrinfo, r, freeaddrinfo);
if(getaddrinfo(server.c_str(), sport, (const addrinfo*)&hints, &r)) { if(getaddrinfo(server.c_str(), sport, (const addrinfo*)&hints, &r)) {
return srs_error_new(ERROR_SYSTEM_IP_INVALID, "get address info"); 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; hints.ai_flags = AI_NUMERICHOST;
addrinfo* r = NULL; addrinfo* r = NULL;
SrsAutoFreeF(addrinfo, r); SrsAutoFreeH(addrinfo, r, freeaddrinfo);
if(getaddrinfo(ip.c_str(), sport, (const addrinfo*)&hints, &r)) { if(getaddrinfo(ip.c_str(), sport, (const addrinfo*)&hints, &r)) {
return srs_error_new(ERROR_SYSTEM_IP_INVALID, "getaddrinfo hints=(%d,%d,%d)", return srs_error_new(ERROR_SYSTEM_IP_INVALID, "getaddrinfo hints=(%d,%d,%d)",
hints.ai_family, hints.ai_socktype, hints.ai_flags); 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; hints.ai_flags = AI_NUMERICHOST;
addrinfo* r = NULL; addrinfo* r = NULL;
SrsAutoFree(addrinfo, r); SrsAutoFreeH(addrinfo, r, freeaddrinfo);
if(getaddrinfo(ip.c_str(), sport, (const addrinfo*)&hints, &r)) { if(getaddrinfo(ip.c_str(), sport, (const addrinfo*)&hints, &r)) {
return srs_error_new(ERROR_SYSTEM_IP_INVALID, "getaddrinfo hints=(%d,%d,%d)", return srs_error_new(ERROR_SYSTEM_IP_INVALID, "getaddrinfo hints=(%d,%d,%d)",
hints.ai_family, hints.ai_socktype, hints.ai_flags); hints.ai_family, hints.ai_socktype, hints.ai_flags);