Merge pull request #1525 from lesserwhirls/gh-1523

Fix integer overflow for inflate

Author: lesserwhirls

cdm/core/src/main/java/ucar/nc2/filter/Deflate.java

@@ -69,7 +69,8 @@ public byte[] encode(byte[] dataIn) throws IOException {
 
   @Override
   public byte[] decode(byte[] dataIn) throws IOException {
-    int len = Math.min(8 * dataIn.length, MAX_ARRAY_LEN);
+    long approxLen = (long) 8 * dataIn.length;
+    int len = approxLen > MAX_ARRAY_LEN ? MAX_ARRAY_LEN : (int) approxLen;
     try (ByteArrayInputStream in = new ByteArrayInputStream(dataIn);
         InflaterInputStream iis = new InflaterInputStream(in, new Inflater(), dataIn.length);
         ByteArrayOutputStream os = new ByteArrayOutputStream(len)) {

cdm/core/src/main/java/ucar/nc2/iosp/hdf5/H5tiledLayoutBB.java

@@ -252,7 +252,8 @@ private byte[] inflate(byte[] compressed) throws IOException {
 
         java.util.zip.InflaterInputStream inflatestream =
             new java.util.zip.InflaterInputStream(in, inflater, inflatebuffersize);
-        int len = Math.min(8 * compressed.length, MAX_ARRAY_LEN);
+        long approxLen = (long) 8 * compressed.length;
+        int len = approxLen > MAX_ARRAY_LEN ? MAX_ARRAY_LEN : (int) approxLen;
         ByteArrayOutputStream out = new ByteArrayOutputStream(len); // Fixes KXL-349288
         IO.copyB(inflatestream, out, len);