Check whether we actually have a GroupId before trying to use it. (#36729)

bzbarsky-apple · andy31415 · web-flow · commit dfe247761376 · 2024-12-05T08:49:37.000-08:00
This avoids a crash on malformed messages (which will get dropped further down the pipeline, due to not being valid). Fixes #36711 Co-authored-by: Andrei Litvin <andy314@gmail.com>
diff --git a/src/messaging/ExchangeMgr.cpp b/src/messaging/ExchangeMgr.cpp
@@ -284,8 +284,15 @@ void ExchangeManager::OnMessageReceived(const PacketHeader & packetHeader, const
     }
     else
     {
-        ChipLogProgress(ExchangeManager, "Received Groupcast Message with GroupId 0x%04X (%d)",
-                        packetHeader.GetDestinationGroupId().Value(), packetHeader.GetDestinationGroupId().Value());
+        if (packetHeader.GetDestinationGroupId().HasValue())
+        {
+            ChipLogProgress(ExchangeManager, "Received Groupcast Message with GroupId 0x%04X (%d)",
+                            packetHeader.GetDestinationGroupId().Value(), packetHeader.GetDestinationGroupId().Value());
+        }
+        else
+        {
+            ChipLogProgress(ExchangeManager, "Received Groupcast Message without GroupId");
+        }
     }
 
     // Do not handle messages that don't match an existing exchange on an

Original file line number	Diff line number	Diff line change
`@@ -284,8 +284,15 @@ void ExchangeManager::OnMessageReceived(const PacketHeader & packetHeader, const`
`284`	`284`	`}`
`285`	`285`	`else`
`286`	`286`	`{`
`287`		`- ChipLogProgress(ExchangeManager, "Received Groupcast Message with GroupId 0x%04X (%d)",`
`288`		`- packetHeader.GetDestinationGroupId().Value(), packetHeader.GetDestinationGroupId().Value());`
	`287`	`+ if (packetHeader.GetDestinationGroupId().HasValue())`
	`288`	`+ {`
	`289`	`+ ChipLogProgress(ExchangeManager, "Received Groupcast Message with GroupId 0x%04X (%d)",`
	`290`	`+ packetHeader.GetDestinationGroupId().Value(), packetHeader.GetDestinationGroupId().Value());`
	`291`	`+ }`
	`292`	`+ else`
	`293`	`+ {`
	`294`	`+ ChipLogProgress(ExchangeManager, "Received Groupcast Message without GroupId");`
	`295`	`+ }`
`289`	`296`	`}`
`290`	`297`
`291`	`298`	`// Do not handle messages that don't match an existing exchange on an`