CastingDiscovery: fix snprintf warning (#29534)

* CastingDiscovery: fix snprintf warning snprintf appends a null terminator, as does strcat, so both buffers need to be upsized by 1 to accommodate that. * ID buffer size was also incorrect * Restyled by clang-format --------- Co-authored-by: Restyled.io <[email protected]>
project-chip · Jan 18, 2024 · 3511618 · 3511618
1 parent 6297644
commit 3511618
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.h b/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.h
@@ -40,12 +40,13 @@ using ConnectCallback    = std::function<void(ConnectionError)>;
 using DisconnectCallback = std::function<void(void)>;
 
 const int kPortMaxLength = 5; // port is uint16_t
-const int kIdMaxLength   = chip::Dnssd::kHostNameMaxLength + kPortMaxLength;
+// +1 for the : between the hostname and the port.
+const int kIdMaxLength = chip::Dnssd::kHostNameMaxLength + kPortMaxLength + 1;
 
 class CastingPlayerAttributes
 {
 public:
-    char id[kIdMaxLength]                                  = {};
+    char id[kIdMaxLength + 1]                              = {};
     char deviceName[chip::Dnssd::kMaxDeviceNameLen + 1]    = {};
     char hostName[chip::Dnssd::kHostNameMaxLength + 1]     = {};
     char instanceName[chip::Dnssd::kHostNameMaxLength + 1] = {};

diff --git a/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp b/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp
@@ -81,7 +81,7 @@ void DeviceDiscoveryDelegateImpl::OnDiscoveredDevice(const chip::Dnssd::Discover
     CastingPlayerAttributes attributes;
     strcpy(attributes.id, nodeData.resolutionData.hostName);
 
-    char port[kPortMaxLength] = {};
+    char port[kPortMaxLength + 1] = {};
     snprintf(port, sizeof(port), "%u", nodeData.resolutionData.port);
     strcat(attributes.id, port);