From 16cd2998db801c8ff6625e1220aad91623b03eed Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 11 Jul 2017 16:15:02 +0100 Subject: [PATCH] Use original frame size as arbiter for frame size, hopefully fixes #154 --- src/main/java/org/spongepowered/asm/util/Locals.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/util/Locals.java b/src/main/java/org/spongepowered/asm/util/Locals.java index 1fb81cea..5f7f2a75 100644 --- a/src/main/java/org/spongepowered/asm/util/Locals.java +++ b/src/main/java/org/spongepowered/asm/util/Locals.java @@ -166,7 +166,7 @@ public final class Locals { FrameNode frameNode = (FrameNode)insn; FrameData frameData = frameIndex < frames.size() ? frames.get(frameIndex) : null; - locals = frameData != null && frameData.type == Opcodes.F_FULL ? Math.max(locals, frameNode.local.size()) : frameNode.local.size(); + locals = frameData != null && frameData.type == Opcodes.F_FULL ? Math.min(locals, frameData.locals) : frameNode.local.size(); // localPos tracks the location in the frame node's locals list, which doesn't leave space for TOP entries for (int localPos = 0, framePos = 0; framePos < frame.length; framePos++, localPos++) {