From 9be62fb16ec1c32aacb069aaec91bf59aecf76b0 Mon Sep 17 00:00:00 2001 From: Skylot Date: Sat, 8 Sep 2018 17:45:04 +0300 Subject: [PATCH] fix: lower regions count limit (#354) --- .../jadx/core/dex/visitors/regions/RegionMaker.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 index ad807a5b..80860bf5 100644 --- 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 @@ -55,16 +55,16 @@ import static jadx.core.utils.BlockUtils.skipSyntheticSuccessor; public class RegionMaker { private static final Logger LOG = LoggerFactory.getLogger(RegionMaker.class); - // 'dumb' guard to prevent endless loop in regions processing - private static final int REGIONS_LIMIT = 1000 * 1000; - private final MethodNode mth; + private final int regionsLimit; private int regionsCount; private BitSet processedBlocks; public RegionMaker(MethodNode mth) { this.mth = mth; - this.processedBlocks = new BitSet(mth.getBasicBlocks().size()); + int blocksCount = mth.getBasicBlocks().size(); + this.processedBlocks = new BitSet(blocksCount); + this.regionsLimit = blocksCount * 100; } public Region makeRegion(BlockNode startBlock, RegionStack stack) { @@ -84,7 +84,7 @@ public class RegionMaker { while (next != null) { next = traverse(r, next, stack); regionsCount++; - if (regionsCount > REGIONS_LIMIT) { + if (regionsCount > regionsLimit) { throw new JadxRuntimeException("Regions count limit reached"); } } -- GitLab