Add checks for offset/size/length

luben · Jun 4, 2024 · 7fd6382 · 7fd6382
1 parent c88623b
commit 7fd6382
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/main/java/com/github/luben/zstd/ZstdCompressCtx.java b/src/main/java/com/github/luben/zstd/ZstdCompressCtx.java
@@ -5,6 +5,7 @@
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import java.util.Objects;
 
 public class ZstdCompressCtx extends AutoCloseBase {
 
@@ -525,6 +526,8 @@ public int compressDirectByteBuffer(ByteBuffer dstBuff, int dstOffset, int dstSi
         if (!dstBuff.isDirect()) {
             throw new IllegalArgumentException("dstBuff must be a direct buffer");
         }
+        Objects.checkFromIndexSize(srcOffset, srcSize, srcBuff.limit());
+        Objects.checkFromIndexSize(dstOffset, dstSize, dstBuff.limit());
 
         acquireSharedLock();
 
@@ -560,6 +563,9 @@ public int compressDirectByteBuffer(ByteBuffer dstBuff, int dstOffset, int dstSi
      * @return  the number of bytes written into buffer 'dstBuff'.
      */
     public int compressByteArray(byte[] dstBuff, int dstOffset, int dstSize, byte[] srcBuff, int srcOffset, int srcSize) {
+        Objects.checkFromIndexSize(srcOffset, srcSize, srcBuff.length);
+        Objects.checkFromIndexSize(dstOffset, dstSize, dstBuff.length);
+
         ensureOpen();
         acquireSharedLock();
 

diff --git a/src/main/java/com/github/luben/zstd/ZstdDecompressCtx.java b/src/main/java/com/github/luben/zstd/ZstdDecompressCtx.java
@@ -5,6 +5,7 @@
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import java.util.Objects;
 
 public class ZstdDecompressCtx extends AutoCloseBase {
 
@@ -163,6 +164,8 @@ public int decompressDirectByteBuffer(ByteBuffer dstBuff, int dstOffset, int dst
         if (!dstBuff.isDirect()) {
             throw new IllegalArgumentException("dstBuff must be a direct buffer");
         }
+        Objects.checkFromIndexSize(srcOffset, srcSize, srcBuff.limit());
+        Objects.checkFromIndexSize(dstOffset, dstSize, dstBuff.limit());
 
         acquireSharedLock();
 
@@ -196,6 +199,9 @@ public int decompressDirectByteBuffer(ByteBuffer dstBuff, int dstOffset, int dst
      * @return the number of bytes decompressed into destination buffer (originalSize)
      */
     public int decompressByteArray(byte[] dstBuff, int dstOffset, int dstSize, byte[] srcBuff, int srcOffset, int srcSize) {
+        Objects.checkFromIndexSize(srcOffset, srcSize, srcBuff.length);
+        Objects.checkFromIndexSize(dstOffset, dstSize, dstBuff.length);
+
         ensureOpen();
         acquireSharedLock();