v2021.12.16 - several improvements

Author: juliusmusseau

CHANGELOG.md

@@ -11,16 +11,16 @@ exploded jar files just sitting uncompressed on the file-system (aka *.class).
 
 # Example Usage:
 
-java -jar log4j-detector-2021.12.15.jar [path-to-scan] > hits.txt
+java -jar log4j-detector-2021.12.16.jar [path-to-scan] > hits.txt
 
 ![Terminal output from running java -jar log4j-detector.jar in a terminal](./log4j-detector.png)
 
 # More Example Usage:
 
 ```
-java -jar log4j-detector-2021.12.15.jar ./samples 
+java -jar log4j-detector-2021.12.16.jar ./samples 
 
--- github.com/mergebase/log4j-detector v2021.12.15 (by mergebase.com) analyzing paths (could take a while).
+-- github.com/mergebase/log4j-detector v2021.12.16 (by mergebase.com) analyzing paths (could take a while).
 -- Note: specify the '--verbose' flag to have every file examined printed to STDERR.
 /opt/mergebase/log4j-detector/samples/clt-1.0-SNAPSHOT.jar contains Log4J-2.x   >= 2.10.0 _VULNERABLE_ :-(
 /opt/mergebase/log4j-detector/samples/infinispan-embedded-query-8.2.12.Final.jar contains Log4J-2.x   >= 2.0-beta9 (< 2.10.0) _VULNERABLE_ :-(
@@ -84,15 +84,15 @@ your system (e.g., 1 GB or larger).
 # Usage
 
 ```
-java -jar log4j-detector-2021.12.15.jar 
+java -jar log4j-detector-2021.12.16.jar 
 
-Usage: java -jar log4j-detector-2021.12.15.jar [--verbose] [paths to scan...]
+Usage: java -jar log4j-detector-2021.12.16.jar [--verbose] [paths to scan...]
 
 Exit codes:  0 = No vulnerable Log4J versions found.
              1 = At least one legacy Log4J 1.x version found.
              2 = At least one vulnerable Log4J version found.
 
-About - MergeBase log4j detector (version 2021.12.15)
+About - MergeBase log4j detector (version 2021.12.16)
 Docs  - https://github.com/mergebase/log4j-detector 
 (C) Copyright 2021 Mergebase Software Inc. Licensed to you via GPLv3.
 ```
@@ -103,7 +103,7 @@ Docs  - https://github.com/mergebase/log4j-detector
 git clone https://github.com/mergebase/log4j-detector.git
 cd log4j-detector/
 mvn install
-java -jar target/log4j-detector-2021.12.15.jar
+java -jar target/log4j-detector-2021.12.16.jar
 ```
 
 # License

README.md

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.mergebase</groupId>
     <artifactId>log4j-detector</artifactId>
-    <version>2021.12.15</version>
+    <version>2021.12.16</version>
     <licenses>
         <license>
             <name>GPL-3.0-only</name>

log4j-detector-2021.12.16.jar

@@ -1,5 +1,6 @@
 package com.mergebase.log4j;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -105,8 +106,21 @@ public static int[] fill(
                 read += lastRead;
             }
         }
+
+        if (lastRead != -1 && read + offset == buf.length) {
+            if (in.markSupported()) {
+                in.mark(1);
+                int peek = in.read();
+                if (peek == -1) {
+                    lastRead = -1;
+                } else {
+                    in.reset();
+                }
+            }
+        }
+
         // If read + offset == buf.length, we are done!
-        return new int[]{offset + read, read + offset == buf.length ? -1 : lastRead};
+        return new int[]{offset + read, lastRead};
     }
 
     public static byte[] resizeArray(final byte[] bytes) {
@@ -161,4 +175,11 @@ private static int[] kmpFailure(byte[] pattern) {
         return failure;
     }
 
+    public static void disabledMain(String[] args) throws Exception {
+        String abc = "abc";
+        byte[] bytes = abc.getBytes(UTF_8);
+        ByteArrayInputStream bin = new ByteArrayInputStream(bytes);
+        byte[] result = Bytes.streamToBytes(bin, false, 2);
+        System.out.println("AFTER = [" + new String(result, UTF_8) + "]");
+    }
 }