yet another fix for APKs that do not pull exception references

soot-oss · Nov 26, 2015 · 6d1c274 · 6d1c274
1 parent 08d7bbb
commit 6d1c274
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/soot/dexpler/DexTrapStackFixer.java b/src/soot/dexpler/DexTrapStackFixer.java
@@ -43,7 +43,9 @@ protected void internalTransform(Body b, String phaseName,
 			// Add the exception reference
 			Local l = new LocalGenerator(b).generateLocal(t.getException().getType());
 			Stmt caughtStmt = Jimple.v().newIdentityStmt(l, Jimple.v().newCaughtExceptionRef());
-			b.getUnits().insertBefore(caughtStmt, t.getHandlerUnit());
+			b.getUnits().add(caughtStmt);
+			b.getUnits().add(Jimple.v().newGotoStmt(t.getHandlerUnit()));
+			t.setHandlerUnit(caughtStmt);
 		}
 	}