Skip to content

fix ifa->ifa_addr nullptr #5863

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

fix ifa->ifa_addr nullptr #5863

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e7d9962
fix ifa->ifa_addr 空指针
qingyan01 Apr 18, 2024
73ff1a2
Merge branch 'master' into master
qingyan01 Apr 18, 2024
a641d3f
move the following auto *addr above the if and check whether the addr…
qingyan01 Apr 19, 2024
2ed1cf9
move addr
qingyan01 May 7, 2024
8bb11b5
Update NetworkUtils.cpp
qingyan01 May 31, 2024
a6f7872
Merge branch 'master' into master
Salieri-004 May 31, 2024
0765ac3
Merge branch 'master' into master
qingyan01 Aug 9, 2024
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 src/common/network/NetworkUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,12 @@ StatusOr<std::vector<std::pair<std::string, std::string>>> NetworkUtils::listDev
return Status::Error("%s", ::strerror(errno));
}
for (auto* ifa = iflist; ifa != nullptr; ifa = ifa->ifa_next) {
auto* addr_ptr = ifa->ifa_addr;
// Skip non-IPv4 devices
if (ifa->ifa_addr->sa_family != AF_INET) {
if (nullptr == addr_ptr || addr_ptr->sa_family != AF_INET) {
continue;
}
auto* addr = reinterpret_cast<struct sockaddr_in*>(ifa->ifa_addr);
auto* addr = reinterpret_cast<struct sockaddr_in*>(addr_ptr);
// inet_ntoa is thread safe but not re-entrant,
// we could use inet_ntop instead when we need support for IPv6
dev2ipv4s.emplace_back(ifa->ifa_name, ::inet_ntoa(addr->sin_addr));
Expand Down