fix: prevent NPE while processing try/catch regions (#673)

skylot · May 29, 2019 · b158858 · b158858
1 parent d673786
commit b158858
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java b/jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java
@@ -954,6 +954,9 @@ public IRegion processTryCatchBlocks(MethodNode mth) {
 			Set<BlockNode> exits = new HashSet<>();
 			for (BlockNode splitter : splitters) {
 				for (BlockNode handler : blocks) {
+					if (handler.contains(AFlag.REMOVE)) {
+						continue;
+					}
 					List<BlockNode> s = splitter.getSuccessors();
 					if (s.isEmpty()) {
 						LOG.debug(ErrorsCounter.formatMsg(mth, "No successors for splitter: " + splitter));

diff --git a/jadx-core/src/main/java/jadx/core/utils/BlockUtils.java b/jadx-core/src/main/java/jadx/core/utils/BlockUtils.java
@@ -432,6 +432,9 @@ public static BlockNode getPathCross(MethodNode mth, BlockNode b1, BlockNode b2)
 		if (b1 == null || b2 == null) {
 			return null;
 		}
+		if (b1.getDomFrontier() == null || b2.getDomFrontier() == null) {
+			return null;
+		}
 		BitSet b = new BitSet();
 		b.or(b1.getDomFrontier());
 		b.and(b2.getDomFrontier());