Use original frame size as arbiter for frame size, hopefully fixes #154

This commit is contained in:
Mumfrey committed 2017-07-11 16:15:02 +01:00
1 parent 381b945951
commit 16cd2998db
1 file changed
+1 -1
@@ -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++) {