Check if slave part is available on match

csowada · Jan 20, 2020 · 416de2f · 416de2f
1 parent 54e4250
commit 416de2f
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/main/java/de/csdev/ebus/command/EBusCommandRegistry.java b/src/main/java/de/csdev/ebus/command/EBusCommandRegistry.java
@@ -268,16 +268,21 @@ public boolean matchesCommand(IEBusCommandMethod command, ByteBuffer data) {
 
                         int computedSlaveLen = EBusCommandUtils.getSlaveDataLength(command);
                         int slaveLenPos = masterTelegram.limit() + 1;
-                        int slaveLen = data.get(slaveLenPos);
 
-                        if (slaveLen != computedSlaveLen) {
-                            if (logger.isTraceEnabled()) {
-                                logger.trace("Skip matching command due to invalid response data length ... [{}]",
-                                        EBusCommandUtils.getFullId(command));
-                                logger.trace("DATA: {}", EBusUtils.toHexDumpString(data));
-                            }
+                        // only check if the slave part is included in the data bytes
+                        if (slaveLenPos <= data.limit()) {
 
-                            return false;
+                            int slaveLen = data.get(slaveLenPos);
+
+                            if (slaveLen != computedSlaveLen) {
+                                if (logger.isTraceEnabled()) {
+                                    logger.trace("Skip matching command due to invalid response data length ... [{}]",
+                                            EBusCommandUtils.getFullId(command));
+                                    logger.trace("DATA: {}", EBusUtils.toHexDumpString(data));
+                                }
+
+                                return false;
+                            }
                         }
 
                     }