Merge branch 'VerifyErrorFix' into CustomizedSoot

tim-hoffman · Aug 31, 2015 · a0aa5e1 · a0aa5e1
2 parents 168a5a7 + a63d9d9
commit a0aa5e1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/soot/toolkits/graph/ExceptionalUnitGraph.java b/src/soot/toolkits/graph/ExceptionalUnitGraph.java
@@ -352,7 +352,7 @@ protected Map<Unit, Collection<ExceptionDest>> buildExceptionDests(
 				}
 				ThrowableSet.Pair catchableAs = thrownSet
 						.whichCatchableAs(catcher);
-				if (!catchableAs.getCaught().equals(
+				if (unit.equals(trap.getBeginUnit()) || !catchableAs.getCaught().equals(
 						ThrowableSet.Manager.v().EMPTY)) {
 					result = addDestToMap(result, unit, trap,
 							catchableAs.getCaught());
@@ -936,4 +936,4 @@ public String toString() {
 
 		return buf.toString();
 	}
-}
+}