commit 49895313241524d9a90c65aae9a195435fc5aaab
author Wang Qixiang <43193572+wqx6@users.noreply.github.com> Tue Feb 27 03:13:57 2024 +0800
committer GitHub <noreply@github.com> Mon Feb 26 19:13:57 2024 +0000
tree e5f936342dbc14946dd8ce40453d416feebf1b34
parent 3b407b1209aeddfa0cd1bb9a35e31c6be87a8613

ESP32: fix conversion error for EndpointQueueFilter (#32287)

src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp

diff --git a/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp b/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp
index 8fb52e7..5fefcb5 100644
--- a/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp
+++ b/src/platform/ESP32/ConnectivityManagerImpl_WiFi.cpp
@@ -1119,8 +1119,8 @@
         {
             uint8_t dig1               = (station_mac[i] & 0xF0) >> 4;
             uint8_t dig2               = station_mac[i] & 0x0F;
-            station_mac_str[2 * i]     = dig1 > 9 ? ('A' + dig1 - 0xA) : ('0' + dig1);
-            station_mac_str[2 * i + 1] = dig2 > 9 ? ('A' + dig2 - 0xA) : ('0' + dig2);
+            station_mac_str[2 * i]     = static_cast<char>(dig1 > 9 ? ('A' + dig1 - 0xA) : ('0' + dig1));
+            station_mac_str[2 * i + 1] = static_cast<char>(dig2 > 9 ? ('A' + dig2 - 0xA) : ('0' + dig2));
         }
         if (sEndpointQueueFilter.SetMdnsHostName(chip::CharSpan(station_mac_str)) == CHIP_NO_ERROR)
         {

src/platform/ESP32/ESP32EndpointQueueFilter.h

diff --git a/src/platform/ESP32/ESP32EndpointQueueFilter.h b/src/platform/ESP32/ESP32EndpointQueueFilter.h
index e7d154d..031ea29 100644
--- a/src/platform/ESP32/ESP32EndpointQueueFilter.h
+++ b/src/platform/ESP32/ESP32EndpointQueueFilter.h
@@ -103,7 +103,7 @@
         {
             if (hostNameLowerCase[i] <= 'F' && hostNameLowerCase[i] >= 'A')
             {
-                hostNameLowerCase[i] = 'a' + hostNameLowerCase[i] - 'A';
+                hostNameLowerCase[i] = static_cast<uint8_t>('a' + hostNameLowerCase[i] - 'A');
             }
         }
         return PayloadContains(payload, ByteSpan(mHostNameBuffer)) || PayloadContains(payload, ByteSpan(hostNameLowerCase));