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

Jump to bottom

Skip addr memcmp if getifaddrs returns a null ifa_addr pointer #3626

Merged
merged 1 commit into from
Dec 20, 2023
Merged

Skip addr memcmp if getifaddrs returns a null ifa_addr pointer #3626

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 17 additions & 14 deletions javalib/src/main/scala/java/net/NetworkInterface.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,19 +316,22 @@ object NetworkInterface {
private def unixGetByInetAddress(addr: InetAddress): NetworkInterface = {

def found(addr: Array[Byte], addrLen: Int, sa: Ptr[sockaddr]): Boolean = {
val sa_family = sa.sa_family.toInt
if (sa_family == AF_INET6) {
if (addrLen != 16) false
else {
val sa6 = sa.asInstanceOf[Ptr[sockaddr_in6]]
val sin6Addr = sa6.sin6_addr.at1.at(0).asInstanceOf[Ptr[Byte]]
memcmp(addr.at(0), sin6Addr, addrLen.toUInt) == 0
}
} else if (sa_family == AF_INET) {
val sa4 = sa.asInstanceOf[Ptr[sockaddr_in]]
val sin4Addr = sa4.sin_addr.at1.asInstanceOf[Ptr[Byte]]
memcmp(addr.at(0), sin4Addr, addrLen.toUInt) == 0
} else false
if (sa == null) false
else {
val sa_family = sa.sa_family.toInt
if (sa_family == AF_INET6) {
if (addrLen != 16) false
else {
val sa6 = sa.asInstanceOf[Ptr[sockaddr_in6]]
val sin6Addr = sa6.sin6_addr.at1.at(0).asInstanceOf[Ptr[Byte]]
memcmp(addr.at(0), sin6Addr, addrLen.toUInt) == 0
}
} else if (sa_family == AF_INET) {
val sa4 = sa.asInstanceOf[Ptr[sockaddr_in]]
val sin4Addr = sa4.sin_addr.at1.asInstanceOf[Ptr[Byte]]
memcmp(addr.at(0), sin4Addr, addrLen.toUInt) == 0
} else false
}
}

@tailrec
Expand All @@ -344,7 +347,7 @@ object NetworkInterface {
findIfInetAddress(
ipAddress,
addrLen,
ifa.ifa_next.asInstanceOf[Ptr[ifaddrs]]
ifa.ifa_next
)
}

Expand Down