hiro/ray
1
0
Fork 0
mirror of https://github.com/vale981/ray synced 2025-03-08 11:31:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix segfault in network utils (#10741)

Browse source
This commit is contained in:
Stephanie Wang 2020-09-11 15:35:03 -07:00 • committed by GitHub
parent 6662efd74b
commit dbca2f9889
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ray/common/network_util.cc
View file

@ -97,7 +97,7 @@ std::vector<boost::asio::ip::address> GetValidLocalIpCandidates() {
struct ifaddrs *if_info = nullptr; struct ifaddrs *if_info = nullptr;
for (if_info = ifs_info; if_info != nullptr; if_info = if_info->ifa_next) { for (if_info = ifs_info; if_info != nullptr; if_info = if_info->ifa_next) {
if (if_info->ifa_addr->sa_family == AF_INET) { if (if_info->ifa_addr && if_info->ifa_addr->sa_family == AF_INET) {
void *addr = &((struct sockaddr_in *)if_info->ifa_addr)->sin_addr; void *addr = &((struct sockaddr_in *)if_info->ifa_addr)->sin_addr;
char ip[INET_ADDRSTRLEN]; char ip[INET_ADDRSTRLEN];
@ -115,7 +115,8 @@ std::vector<boost::asio::ip::address> GetValidLocalIpCandidates() {
// Filter out interfaces with small possibility of being desired to be used to serve // Filter out interfaces with small possibility of being desired to be used to serve
std::sort(ifnames_and_ips.begin(), ifnames_and_ips.end(), CompNamesAndIps); std::sort(ifnames_and_ips.begin(), ifnames_and_ips.end(), CompNamesAndIps);
while (GetPriority(ifnames_and_ips.back().first) == Priority::kExclude) { while (!ifnames_and_ips.empty() &&
GetPriority(ifnames_and_ips.back().first) == Priority::kExclude) {
ifnames_and_ips.pop_back(); ifnames_and_ips.pop_back();
} }