fix: search exception handler splitter block by offset if jump source…

… unknown (#406)
skylot · Dec 25, 2018 · e9591ef · e9591ef
1 parent fbf750f
commit e9591ef
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/BlockSplitter.java b/jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/BlockSplitter.java
@@ -223,12 +223,13 @@ private static void setupConnections(MethodNode mth, Map<Integer, BlockNode> blo
 					BlockNode thisBlock = getBlock(jump.getDest(), blocksMap);
 					connect(srcBlock, thisBlock);
 				}
-				connectExceptionHandlers(block, insn);
+				connectExceptionHandlers(block, insn, blocksMap);
 			}
 		}
 	}
 
-	private static void connectExceptionHandlers(BlockNode block, InsnNode insn) {
+	private static void connectExceptionHandlers(BlockNode block, InsnNode insn,
+	                                             Map<Integer, BlockNode> blocksMap) {
 		CatchAttr catches = insn.get(AType.CATCH_BLOCK);
 		SplitterBlockAttr spl = block.get(AType.SPLITTER_BLOCK);
 		if (catches == null || spl == null) {
@@ -237,7 +238,7 @@ private static void connectExceptionHandlers(BlockNode block, InsnNode insn) {
 		BlockNode splitterBlock = spl.getBlock();
 		boolean tryEnd = insn.contains(AFlag.TRY_LEAVE);
 		for (ExceptionHandler h : catches.getTryBlock().getHandlers()) {
-			BlockNode handlerBlock = h.getHandlerBlock();
+			BlockNode handlerBlock = initHandlerBlock(h, blocksMap);
 			// skip self loop in handler
 			if (splitterBlock != handlerBlock) {
 				if (!handlerBlock.contains(AType.SPLITTER_BLOCK)) {
@@ -251,6 +252,16 @@ private static void connectExceptionHandlers(BlockNode block, InsnNode insn) {
 		}
 	}
 
+	private static BlockNode initHandlerBlock(ExceptionHandler excHandler, Map<Integer, BlockNode> blocksMap) {
+		BlockNode handlerBlock = excHandler.getHandlerBlock();
+		if (handlerBlock != null) {
+			return handlerBlock;
+		}
+		BlockNode blockByOffset = getBlock(excHandler.getHandleOffset(), blocksMap);
+		excHandler.setHandlerBlock(blockByOffset);
+		return blockByOffset;
+	}
+
 	private static boolean isSplitByJump(InsnNode prevInsn, InsnNode currentInsn) {
 		List<JumpInfo> pJumps = prevInsn.getAll(AType.JUMP);
 		for (JumpInfo jump : pJumps) {