Fix JANDEX-33 Infinite loop on corrupted class file in JAR stream

smallrye · Jul 20, 2015 · f52aa53 · f52aa53
1 parent b5c334c
commit f52aa53
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/main/java/org/jboss/jandex/Indexer.java b/src/main/java/org/jboss/jandex/Indexer.java
@@ -187,6 +187,14 @@ private static void skipFully(InputStream s, long n) throws IOException {
             if (skipped < 0)
                 throw new EOFException();
             total += skipped;
+
+            // Skip is not guaranteed to distinguish between EOF and nothing-read
+            if (skipped == 0) {
+                if (s.read() < 0) {
+                    throw new EOFException();
+                }
+                total++;
+            }
         }
     }