Merge pull request #90 from pablojrl123/getifaddrs-nullptr-fix

Prevent null pointer deference in get_mac_address
games-on-whales · Jul 31, 2024 · e10d00b · e10d00b
2 parents bb8559c + a17a260
commit e10d00b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/moonlight-server/platforms/hw_linux.cpp b/src/moonlight-server/platforms/hw_linux.cpp
@@ -213,7 +213,7 @@ std::string get_mac_address(std::string_view local_ip) {
   if (!interface.empty()) {
     logs::log(logs::trace, "Found interface: {}, looking for MAC address", interface);
     for (auto ifa = ifAddrStruct.get(); ifa != NULL; ifa = ifa->ifa_next) {
-      if (ifa->ifa_name && interface == ifa->ifa_name && ifa->ifa_addr->sa_family == AF_PACKET) {
+      if (ifa->ifa_name && interface == ifa->ifa_name && ifa->ifa_addr && ifa->ifa_addr->sa_family == AF_PACKET) {
         struct sockaddr_ll *s = (struct sockaddr_ll *)(ifa->ifa_addr);
         std::vector<std::string> mac(s->sll_halen);
         for (int i = 0; i < s->sll_halen; i++) {
@@ -230,4 +230,4 @@ std::string get_mac_address(std::string_view local_ip) {
             local_ip);
 
   return "00:00:00:00:00:00";
-}
+}