Skip to content

Properly handle unreachable instructions and null stack entries #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
modmuss50 merged 2 commits into from
Oct 18, 2025
Merged

Properly handle unreachable instructions and null stack entries #574

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01121d2
Properly handle unreachable instructions and null stack entries
Geolykt Oct 17, 2025
0dda06d
ASM can be trusted
Geolykt Oct 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion enigma/src/main/java/cuchaz/enigma/analysis/index/IndexReferenceVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,17 @@ public void visitInvokeDynamicInsn(String name, String descriptor, Handle bootst
}

private ReferenceTargetType getReferenceTargetType(int stackDepth) {
if (stack == null) { // Unreachable instruction
return ReferenceTargetType.uninitialized();
}

if (stackDepth >= stack.size()) {
throw new IllegalStateException("Stack depth " + stackDepth + " is higher than the stack: " + stackValuesToString(stack) + " in method " + callerEntry);
}

Object stackValue = stack.get(stack.size() - 1 - stackDepth);

if (stackValue.equals(Opcodes.UNINITIALIZED_THIS) || stackValue instanceof Label) {
if (stackValue.equals(Opcodes.UNINITIALIZED_THIS) || stackValue.equals(Opcodes.NULL) || stackValue instanceof Label) {
return ReferenceTargetType.uninitialized();
}

Expand Down