From f1539d2e3758bef7cef715124e7a0c2ee72aeca0 Mon Sep 17 00:00:00 2001 From: Skylot Date: Sun, 21 Apr 2019 22:34:27 +0300 Subject: [PATCH] fix: resolve NPE due to not yet processed class (#595) --- .../src/main/java/jadx/core/dex/visitors/ModVisitor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java b/jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java index f89193fa3..f8bef6edd 100644 --- a/jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java +++ b/jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java @@ -227,10 +227,6 @@ public class ModVisitor extends AbstractVisitor { if (callMthNode == null) { return; } - Map argsMap = getArgsToFieldsMapping(callMthNode, co); - if (argsMap.isEmpty() && !callMthNode.getArguments(true).isEmpty()) { - return; - } ClassNode classNode = callMthNode.getParentClass(); if (!classNode.contains(AFlag.ANONYMOUS_CLASS)) { @@ -242,6 +238,10 @@ public class ModVisitor extends AbstractVisitor { if (!mth.getParentClass().getInnerClasses().contains(classNode)) { return; } + Map argsMap = getArgsToFieldsMapping(callMthNode, co); + if (argsMap.isEmpty() && !callMthNode.getArguments(true).isEmpty()) { + return; + } for (Map.Entry entry : argsMap.entrySet()) { FieldNode field = entry.getValue();