fix: Gracefully handle missing '[' in multianewarray desc

jumanji144 · Aug 14, 2024 · f61f0e5 · f61f0e5
1 parent 06e5b2c
commit f61f0e5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...sition-jvm/src/main/java/me/darknet/assembler/compile/analysis/jvm/JvmAnalysisEngine.java b/...sition-jvm/src/main/java/me/darknet/assembler/compile/analysis/jvm/JvmAnalysisEngine.java
@@ -83,7 +83,7 @@ public void setErrorCollector(ErrorCollector errorCollector) {
      * @param message
      *         Warning message content.
      */
-    protected void warn(@NotNull CodeElement element, @NotNull String message) {
+    public void warn(@NotNull CodeElement element, @NotNull String message) {
         if (errorCollector == null) return;
         ASTInstruction ast = getCodeToAstMap().get(element);
         if (ast != null) errorCollector.addWarn(message, ast.location());

diff --git a/jasm-composition-jvm/src/main/java/me/darknet/assembler/compile/visitor/BlwCodeVisitor.java b/jasm-composition-jvm/src/main/java/me/darknet/assembler/compile/visitor/BlwCodeVisitor.java
@@ -360,9 +360,17 @@ public void visitInvokeDynamicInsn(ASTIdentifier name, ASTIdentifier descriptor,
 
     @Override
     public void visitMultiANewArrayInsn(ASTIdentifier descriptor, ASTNumber numDimensions) {
-        ArrayType arrayType = Types.arrayTypeFromDescriptor(descriptor.literal());
         int dimSize = numDimensions.asInt();
-        add(new AllocateMultiDimArrayInstruction(arrayType, dimSize));
+        String literal = descriptor.literal();
+        Type literalType = Types.typeFromDescriptor(literal);
+        if (literalType instanceof ArrayType literalArrayType) {
+            add(new AllocateMultiDimArrayInstruction(literalArrayType, dimSize));
+        } else {
+            ArrayType arrayType = Types.arrayType((ClassType) literalType);
+            var insn = new AllocateMultiDimArrayInstruction(arrayType, dimSize);
+            add(insn);
+            analysisEngine.warn(insn, "Expected array type, got class name");
+        }
     }
 
     @Override