fix: NPE in unused EcxHandler block removal code (#2086) (PR #2104)

skylot · Feb 15, 2024 · 5fbabde · 5fbabde
1 parent 13607fc
commit 5fbabde
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockExceptionHandler.java b/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockExceptionHandler.java
@@ -600,7 +600,7 @@ private static void removeUnusedExcHandlers(MethodNode mth, List<TryCatchBlockAt
 		for (ExceptionHandler eh : mth.getExceptionHandlers()) {
 			boolean notProcessed = true;
 			BlockNode handlerBlock = eh.getHandlerBlock();
-			if (blocks.get(handlerBlock)) {
+			if (handlerBlock == null || blocks.get(handlerBlock)) {
 				continue;
 			}
 			for (TryCatchBlockAttr tcb : tryBlocks) {