(maven-dependency-analyzer) 01/01: Handle corrupt constant pools

[el...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch 145
in repository https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git

commit 6fcbe9815398ef2530a085da901cc8e847a8daaa
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Wed Jul 16 06:49:13 2025 -0400

    Handle corrupt constant pools
---
 .../maven/shared/dependency/analyzer/asm/ConstantPoolParser.java   | 7 ++++---
 .../shared/dependency/analyzer/asm/DependencyClassFileVisitor.java | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java
index 1b9da80..33015be 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java
@@ -21,6 +21,7 @@ package org.apache.maven.shared.dependency.analyzer.asm;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.text.ParseException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -104,11 +105,11 @@ public class ConstantPoolParser {
 
     private static final int OX3F = 0x3F;
 
-    static Set<String> getConstantPoolClassReferences(byte[] b) {
+    static Set<String> getConstantPoolClassReferences(byte[] b) throws ParseException {
         return parseConstantPoolClassReferences(ByteBuffer.wrap(b));
     }
 
-    private static Set<String> parseConstantPoolClassReferences(ByteBuffer buf) {
+    private static Set<String> parseConstantPoolClassReferences(ByteBuffer buf) throws ParseException {
         if (buf.order(ByteOrder.BIG_ENDIAN).getInt() != HEAD) {
             return Collections.emptySet();
         }
@@ -171,7 +172,7 @@ public class ConstantPoolParser {
                     consumePackage(buf);
                     break;
                 default:
-                    throw new RuntimeException("Unknown constant pool type '" + tag + "'");
+                    throw new ParseException("Unknown constant pool type '" + tag + "'", ix);
             }
         }
 
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
index 3d16943..9be2a3a 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
@@ -22,6 +22,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
+import java.text.ParseException;
 import java.util.Set;
 
 import org.apache.maven.shared.dependency.analyzer.ClassFileVisitor;
@@ -95,7 +96,7 @@ public class DependencyClassFileVisitor implements ClassFileVisitor {
             // some bug inside ASM causes an IOB exception.
             // this happens when the class isn't valid.
             throw new VisitClassException("Unable to process: " + className, e);
-        } catch (IllegalArgumentException e) {
+        } catch (ParseException | IllegalArgumentException e) {
             throw new VisitClassException("Byte code of '" + className + "' is corrupt", e);
         }
     }