fix(IPAddress) : Missing initialization and boggy comparison with IPv…

…4 addresses
espressif · May 29, 2024 · 763c4ad · 763c4ad
1 parent 79b8350
commit 763c4ad
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/cores/esp32/IPAddress.cpp b/cores/esp32/IPAddress.cpp
@@ -266,7 +266,7 @@ IPAddress &IPAddress::operator=(const IPAddress &address) {
 }
 
 bool IPAddress::operator==(const IPAddress &addr) const {
-  return (addr._type == _type) && (memcmp(addr._address.bytes, _address.bytes, sizeof(_address.bytes)) == 0);
+  return (addr._type == _type) && (_type == IPType::IPv4 ? addr._address.dword[IPADDRESS_V4_DWORD_INDEX] == _address.dword[IPADDRESS_V4_DWORD_INDEX] : memcmp(addr._address.bytes, _address.bytes, sizeof(_address.bytes)) == 0);
 }
 
 bool IPAddress::operator==(const uint8_t *addr) const {
@@ -395,6 +395,9 @@ IPAddress &IPAddress::from_ip_addr_t(const ip_addr_t *addr) {
 #endif /* LWIP_IPV6_SCOPES */
   } else {
     _type = IPv4;
+    _address.dword[0] = 0;
+    _address.dword[1] = 0;
+    _address.dword[2] = 0;
     _address.dword[IPADDRESS_V4_DWORD_INDEX] = addr->u_addr.ip4.addr;
   }
   return *this;