Allow Kotlin class names with parentheses in them (#645)

lukehutch · lukehutch · commit 5bf5ac2e69d7 · 2022-02-11T10:39:54.000-07:00
diff --git a/src/main/java/io/github/classgraph/Classfile.java b/src/main/java/io/github/classgraph/Classfile.java
@@ -1055,10 +1055,12 @@ private List<TypePathNode> readTypePath() throws IOException {
     /**
      * Read constant pool entries.
      *
+     * @param log
+     *            The log
      * @throws IOException
      *             Signals that an I/O exception has occurred.
      */
-    private void readConstantPoolEntries() throws IOException {
+    private void readConstantPoolEntries(final LogNode log) throws IOException {
         // Only record class dependency info if inter-class dependencies are enabled
         List<Integer> classNameCpIdxs = null;
         List<Integer> typeSignatureIdxs = null;
@@ -1198,21 +1200,29 @@ private void readConstantPoolEntries() throws IOException {
                 final String typeSigStr = getConstantPoolString(cpIdx);
                 if (typeSigStr != null) {
                     try {
-                        if (typeSigStr.indexOf('(') >= 0 || "<init>".equals(typeSigStr)) {
-                            // Parse the type signature
-                            final MethodTypeSignature typeSig = MethodTypeSignature.parse(typeSigStr,
+                        if (typeSigStr.startsWith("L") && typeSigStr.endsWith(";")) {
+                            // Parse the class name
+                            final TypeSignature typeSig = TypeSignature.parse(typeSigStr,
                                     /* definingClassName = */ null);
                             // Extract class names from type signature
                             typeSig.findReferencedClassNames(refdClassNames);
-                        } else {
+                        } else if (typeSigStr.indexOf('(') >= 0 || "<init>".equals(typeSigStr)) {
                             // Parse the type signature
-                            final TypeSignature typeSig = TypeSignature.parse(typeSigStr,
+                            final MethodTypeSignature typeSig = MethodTypeSignature.parse(typeSigStr,
                                     /* definingClassName = */ null);
                             // Extract class names from type signature
                             typeSig.findReferencedClassNames(refdClassNames);
+                        } else {
+                            if (log != null) {
+                                log.log("Could not extract referenced class names from constant pool string: "
+                                        + typeSigStr);
+                            }
                         }
                     } catch (final ParseException e) {
-                        throw new ClassfileFormatException("Could not parse type signature: " + typeSigStr, e);
+                        if (log != null) {
+                            log.log("Could not extract referenced class names from constant pool string: "
+                                    + typeSigStr + " : " + e);
+                        }
                     }
                 }
             }
@@ -1947,7 +1957,7 @@ public void decorate(final ClassTypeSignature classTypeSignature) {
             majorVersion = reader.readUnsignedShort();
 
             // Read the constant pool
-            readConstantPoolEntries();
+            readConstantPoolEntries(log);
 
             // Read basic class info (
             readBasicClassInfo();
