Fix: Resolve occasional NPE in Locals calculations.

This commit is contained in:
LlamaLad7 authored and modmuss committed 2024-06-02 19:43:20 +01:00
1 parent 02f8479411
commit 35c079a988
1 file changed
+3 -2
@@ -542,8 +542,9 @@ public final class Locals {
VarInsnNode varInsn = (VarInsnNode)insn;
boolean isLoad = insn.getOpcode() >= Opcodes.ILOAD && insn.getOpcode() <= Opcodes.SALOAD;
if (isLoad) {
frame[varInsn.var] = Locals.getLocalVariableAt(classNode, method, insn, varInsn.var);
int varSize = frame[varInsn.var].desc != null ? Type.getType(frame[varInsn.var].desc).getSize() : 1;
LocalVariableNode toLoad = Locals.getLocalVariableAt(classNode, method, insn, varInsn.var);
frame[varInsn.var] = toLoad;
int varSize = toLoad != null && toLoad.desc != null ? Type.getType(frame[varInsn.var].desc).getSize() : 1;
knownFrameSize = Math.max(knownFrameSize, varInsn.var + varSize);
if (settings.hasFlags(Settings.RESURRECT_EXPOSED_ON_LOAD)) {
Locals.resurrect(frame, knownFrameSize, settings);