Do not insert anything before the super() call in constructors, verif…

…ier will reject anything accessing this reference there
palant · Mar 2, 2021 · 77be944 · 77be944
1 parent dae9006
commit 77be944
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/info/palant/apkInstrumentation/UnitSequence.java b/src/info/palant/apkInstrumentation/UnitSequence.java
@@ -29,6 +29,7 @@
 import soot.jimple.Jimple;
 import soot.jimple.JimpleBody;
 import soot.jimple.NullConstant;
+import soot.jimple.Stmt;
 import soot.jimple.StringConstant;
 
 public class UnitSequence extends ArrayList<Unit>
@@ -295,7 +296,14 @@ public Local getIdentity(Value obj)
 
   public void insertBefore()
   {
-    this.insertBefore(((JimpleBody)this.body).getFirstNonIdentityStmt());
+    Stmt unit = ((JimpleBody)this.body).getFirstNonIdentityStmt();
+    if (this.body.getMethod().getName().equals("<init>") && unit.containsInvokeExpr() && unit.getInvokeExpr().getMethod().getName().equals("<init>"))
+    {
+      // This is a super() constructor call, don't insert before it.
+      this.insertAfter(unit);
+    }
+    else
+      this.insertBefore(unit);
   }
 
   public void insertBefore(Unit unit)