fix: LambdaMetafactory short descriptor being wrongly verified

jumanji144 · Feb 4, 2024 · 293be33 · 293be33
1 parent 5d7601b
commit 293be33
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/jasm-composition-jvm/src/main/java/me/darknet/assembler/util/ConstantMapper.java b/jasm-composition-jvm/src/main/java/me/darknet/assembler/util/ConstantMapper.java
@@ -92,7 +92,19 @@ public static Constant fromConstant(ASTElement element) {
                 assert identifier.content() != null;
                 char first = identifier.content().charAt(0);
                 yield switch (first) {
-                    case 'L' -> new OfType(Types.instanceTypeFromDescriptor(identifier.literal()));
+                    case 'L' -> {
+                        // if last is `;` then it's a class type, if not could be a short handle
+                        char last = identifier.content().charAt(identifier.content().length() - 1);
+                        if(last == ';') {
+                            yield new OfType(Types.instanceTypeFromDescriptor(identifier.literal()));
+                        } else {
+                            Handle handle = Handle.HANDLE_SHORTCUTS.get(identifier.literal());
+                            if (handle != null) {
+                                yield new OfMethodHandle(methodHandleFromHandle(handle));
+                            }
+                            throw new IllegalStateException("Unexpected value: " + first);
+                        }
+                    }
                     case '(' -> new OfType(Types.methodType(identifier.literal()));
                     case '[' -> new OfType(Types.arrayTypeFromDescriptor(identifier.literal()));
                     default -> switch (identifier.literal().toLowerCase()) {

diff --git a/jasm-core/src/main/java/me/darknet/assembler/instructions/jvm/JvmOperands.java b/jasm-core/src/main/java/me/darknet/assembler/instructions/jvm/JvmOperands.java
@@ -113,7 +113,19 @@ public static void verifyConstant(ASTProcessor.ParserContext context, ASTElement
             case IDENTIFIER -> {
                 char first = element.content().charAt(0);
                 boolean valid = switch (first) {
-                    case 'L', '[' -> DescriptorUtil.isValidFieldDescriptor(element.content());
+                    case 'L', '[' -> {
+                        // if last is `;` then it's a class type, if not could be a short handle
+                        char last = element.content().charAt(element.content().length() - 1);
+                        if (last == ';') {
+                            yield DescriptorUtil.isValidFieldDescriptor(element.content());
+                        } else {
+                            Handle handle = Handle.HANDLE_SHORTCUTS.get(element.content());
+                            if (handle == null) {
+                                context.throwUnexpectedElementError("class, method or array descriptor", element);
+                            }
+                            yield true;
+                        }
+                    }
                     case '(' -> DescriptorUtil.isValidMethodDescriptor(element.content());
                     default -> {
                         // maybe its a number handle