Fix potential ArrayIndexOutOfBoundsException (Fixes hierynomus#426)

gorefest · Jul 10, 2023 · 61f398c · 61f398c
1 parent add0a5d
commit 61f398c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/com/hierynomus/mssmb/SMB1PacketFactory.java b/src/main/java/com/hierynomus/mssmb/SMB1PacketFactory.java
@@ -28,6 +28,6 @@ public SMB1PacketData read(byte[] data) throws Buffer.BufferException, IOExcepti
 
     @Override
     public boolean canHandle(byte[] data) {
-        return data[0] == (byte) 0xFF && data[1] == 'S' && data[2] == 'M' && data[3] == 'B';
+        return data.length >= 4 && data[0] == (byte) 0xFF && data[1] == 'S' && data[2] == 'M' && data[3] == 'B';
     }
 }
diff --git a/src/main/java/com/hierynomus/mssmb2/SMB2PacketFactory.java b/src/main/java/com/hierynomus/mssmb2/SMB2PacketFactory.java
@@ -27,6 +27,6 @@ public SMB2PacketData read(byte[] data) throws Buffer.BufferException {
 
     @Override
     public boolean canHandle(byte[] data) {
-        return data[0] == (byte) 0xFE && data[1] == 'S' && data[2] == 'M' && data[3] == 'B';
+        return data.length >= 4 && data[0] == (byte) 0xFE && data[1] == 'S' && data[2] == 'M' && data[3] == 'B';
     }
 }
diff --git a/src/main/java/com/hierynomus/mssmb2/SMB3CompressedPacketFactory.java b/src/main/java/com/hierynomus/mssmb2/SMB3CompressedPacketFactory.java
@@ -28,6 +28,6 @@ public SMB3CompressedPacketData read(byte[] data) throws Buffer.BufferException,
 
     @Override
     public boolean canHandle(byte[] data) {
-        return data[0] == (byte) 0xFC && data[1] == 'S' && data[2] == 'M' && data[3] == 'B';
+        return data.length >= 4 && data[0] == (byte) 0xFC && data[1] == 'S' && data[2] == 'M' && data[3] == 'B';
     }
 }
diff --git a/src/main/java/com/hierynomus/mssmb2/SMB3EncryptedPacketFactory.java b/src/main/java/com/hierynomus/mssmb2/SMB3EncryptedPacketFactory.java
@@ -28,6 +28,6 @@ public SMB3EncryptedPacketData read(byte[] data) throws Buffer.BufferException,
 
     @Override
     public boolean canHandle(byte[] data) {
-        return data[0] == (byte) 0xFD && data[1] == 'S' && data[2] == 'M' && data[3] == 'B';
+        return data.length >= 4 && data[0] == (byte) 0xFD && data[1] == 'S' && data[2] == 'M' && data[3] == 'B';
     }
 }