mirror of
https://github.com/LegacyModdingMC/UniMix.git
synced 2026-11-17 11:05:00 +00:00
Fix NPE when no array-access opcode is found near to field. Closes #166
This commit is contained in:
1 parent
21571470e2
commit
cc4f5f11cd
1 file changed
+10
-3
@@ -356,7 +356,7 @@ public class RedirectInjector extends InvokeInjector {
|
||||
private void injectAtGetArray(Target target, FieldInsnNode fieldNode, AbstractInsnNode varNode, Type ownerType, Type fieldType) {
|
||||
String handlerDesc = Bytecode.generateDescriptor(this.returnType, (Object[])RedirectInjector.getArrayArgs(fieldType));
|
||||
boolean withArgs = this.checkDescriptor(handlerDesc, target, "array getter");
|
||||
this.injectArrayRedirect(target, fieldNode, varNode, withArgs);
|
||||
this.injectArrayRedirect(target, fieldNode, varNode, withArgs, "array getter");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -365,7 +365,7 @@ public class RedirectInjector extends InvokeInjector {
|
||||
private void injectAtSetArray(Target target, FieldInsnNode fieldNode, AbstractInsnNode varNode, Type ownerType, Type fieldType) {
|
||||
String handlerDesc = Bytecode.generateDescriptor(null, (Object[])RedirectInjector.getArrayArgs(fieldType, fieldType.getElementType()));
|
||||
boolean withArgs = this.checkDescriptor(handlerDesc, target, "array setter");
|
||||
this.injectArrayRedirect(target, fieldNode, varNode, withArgs);
|
||||
this.injectArrayRedirect(target, fieldNode, varNode, withArgs, "array setter");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -379,8 +379,15 @@ public class RedirectInjector extends InvokeInjector {
|
||||
* @param varNode array access node
|
||||
* @param withArgs true if the descriptor includes captured arguments from
|
||||
* the target method signature
|
||||
* @param type description of access type for use in error messages
|
||||
*/
|
||||
public void injectArrayRedirect(Target target, FieldInsnNode fieldNode, AbstractInsnNode varNode, boolean withArgs) {
|
||||
public void injectArrayRedirect(Target target, FieldInsnNode fieldNode, AbstractInsnNode varNode, boolean withArgs, String type) {
|
||||
if (varNode == null) {
|
||||
String advice = "";
|
||||
throw new InvalidInjectionException(this.info, "Array element " + this.annotationType + " on " + this + " could not locate a matching "
|
||||
+ type + " instruction in " + target + ". " + advice);
|
||||
}
|
||||
|
||||
if (!this.isStatic) {
|
||||
target.insns.insertBefore(fieldNode, new VarInsnNode(Opcodes.ALOAD, 0));
|
||||
target.addToStack(1);
|
||||
|
||||
Reference in new issue
Block a user