fix: skip over contant pool entries when they are second half of CONS…

…TANT_Long or CONSTANT_Doubles
mebigfatguy · Dec 21, 2023 · 6bff5ba · 6bff5ba
1 parent b00b50f
commit 6bff5ba
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/main/java/com/mebigfatguy/fbcontrib/detect/IncorrectInternalClassUse.java b/src/main/java/com/mebigfatguy/fbcontrib/detect/IncorrectInternalClassUse.java
@@ -20,6 +20,7 @@
 
 import java.util.Set;
 
+import org.apache.bcel.Constants;
 import org.apache.bcel.classfile.Constant;
 import org.apache.bcel.classfile.ConstantClass;
 import org.apache.bcel.classfile.ConstantPool;
@@ -101,7 +102,14 @@ public void visitClassContext(ClassContext context) {
         if (!isInternal(cls.getClassName())) {
             ConstantPool pool = cls.getConstantPool();
             int numItems = pool.getLength();
+
+            byte lastTag = Constants.CONSTANT_Class;
             for (int i = 1; i < numItems; i++) {
+                if (lastTag == Constants.CONSTANT_Double || lastTag == Constants.CONSTANT_Long) {
+                    lastTag = Constants.CONSTANT_Class;
+                    continue;
+                }
+
                 Constant c = pool.getConstant(i);
                 if (c instanceof ConstantClass) {
                     String clsName = ((ConstantClass) c).getBytes(pool);
@@ -111,6 +119,7 @@ public void visitClassContext(ClassContext context) {
                                         .addClass(cls).addString(clsName));
                     }
                 }
+                lastTag = c.getTag();
             }
         }
     }