enforce payload size checking

zigbeefordomoticz · Oct 13, 2023 · c1f8590 · c1f8590
1 parent 074d35c
commit c1f8590
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Modules/tools.py b/Modules/tools.py
@@ -1036,6 +1036,9 @@ def getAttributeValue(self, MsgSrcAddr, MsgSrcEp, MsgClusterId, MsgAttrID):
 def retreive_cmd_payload_from_8002(Payload):
 
     ManufacturerCode = None
+    if len(Payload) < 2:
+        return (None, None, None, None, None, None)
+
     fcf = Payload[:2]
 
     try:
@@ -1047,6 +1050,9 @@ def retreive_cmd_payload_from_8002(Payload):
     if GlobalCommand is None:
         return (None, None, None, None, None, None)
 
+    if len(Payload) < 6:
+        return (None, None, None, None, None, None)
+
     if is_manufspecific_8002_payload(fcf):
         ManufacturerCode = Payload[4:6] + Payload[2:4]
         Sqn = Payload[6:8]