Commit 016a5134 authored by Eric Bruneton's avatar Eric Bruneton
Browse files

Merge branch '317793-fix-wrong-type-for-aaload-in-analyzeradapter' into 'master'

AALOAD should give null when the input array is null.

See merge request !11
parents 14f4b7c3 937167f3
......@@ -1056,7 +1056,7 @@ class Frame {
case Opcodes.AALOAD:
pop(1);
t1 = pop();
push(ELEMENT_OF + t1);
push(t1 == NULL ? t1 : ELEMENT_OF + t1);
break;
case Opcodes.ISTORE:
case Opcodes.FSTORE:
......
......@@ -661,6 +661,8 @@ public class AnalyzerAdapter extends MethodVisitor {
t1 = pop();
if (t1 instanceof String) {
pushDesc(((String) t1).substring(1));
} else if (t1 == Opcodes.NULL) {
push(t1);
} else {
push("java/lang/Object");
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment