jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix: wrap MethodThrowsVisitor insns processing in try/catch (#2441)

Browse Source
This commit is contained in:
Skylot
2025-05-27 19:49:57 +01:00
parent d9d4180581
commit 8b08ac3806
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/main/java/jadx/core/dex/visitors/MethodThrowsVisitor.java
+18 -15
View File
@@ -110,27 +110,30 @@ public class MethodThrowsVisitor extends AbstractVisitor {
toRemove.forEach(excSet::remove);
}
private void processInstructions(MethodNode mth) throws JadxException {
private void processInstructions(MethodNode mth) {
if (mth.isNoCode() || mth.getBasicBlocks() == null) {
return;
}
blocks: for (final BlockNode block : mth.getBasicBlocks()) {
// Skip e.g. throw instructions of synchronized regions
boolean skipExceptions = block.contains(AFlag.REMOVE) || block.contains(AFlag.DONT_GENERATE);
Set<String> excludedExceptions = new HashSet<>();
CatchAttr catchAttr = block.get(AType.EXC_CATCH);
if (catchAttr != null) {
for (ExceptionHandler handler : catchAttr.getHandlers()) {
if (handler.isCatchAll()) {
continue blocks;
try {
blocks: for (final BlockNode block : mth.getBasicBlocks()) {
// Skip e.g. throw instructions of synchronized regions
boolean skipExceptions = block.contains(AFlag.REMOVE) || block.contains(AFlag.DONT_GENERATE);
Set<String> excludedExceptions = new HashSet<>();
CatchAttr catchAttr = block.get(AType.EXC_CATCH);
if (catchAttr != null) {
for (ExceptionHandler handler : catchAttr.getHandlers()) {
if (handler.isCatchAll()) {
continue blocks;
}
excludedExceptions.add(handler.getArgType().toString());
}
excludedExceptions.add(handler.getArgType().toString());
}
for (final InsnNode insn : block.getInstructions()) {
checkInsn(mth, insn, excludedExceptions, skipExceptions);
}
}
for (final InsnNode insn : block.getInstructions()) {
checkInsn(mth, insn, excludedExceptions, skipExceptions);
}
} catch (Exception e) {
mth.addWarnComment("Failed to analyze thrown exceptions", e);
}
}