fix: handle NPE for methods with removed instructions (#342) (PR #583)

skylot · Apr 12, 2019 · 395cae4 · 395cae4
1 parent eb77aa5
commit 395cae4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ExtractFieldInit.java b/jadx-core/src/main/java/jadx/core/dex/visitors/ExtractFieldInit.java
@@ -51,7 +51,8 @@ private static void checkStaticFieldsInit(ClassNode cls) {
 		MethodNode clinit = cls.getClassInitMth();
 		if (clinit == null
 				|| !clinit.getAccessFlags().isStatic()
-				|| clinit.isNoCode()) {
+				|| clinit.isNoCode()
+				|| clinit.getBasicBlocks() == null) {
 			return;
 		}
 
@@ -235,7 +236,7 @@ private static List<MethodNode> getConstructorsList(ClassNode cls) {
 	}
 
 	private static List<InsnNode> getFieldAssigns(MethodNode mth, FieldNode field, InsnType putInsn) {
-		if (mth.isNoCode()) {
+		if (mth.isNoCode() || mth.getBasicBlocks() == null) {
 			return Collections.emptyList();
 		}
 		List<InsnNode> assignInsns = new ArrayList<>();

diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ReSugarCode.java b/jadx-core/src/main/java/jadx/core/dex/visitors/ReSugarCode.java
@@ -218,7 +218,7 @@ private static void processEnumSwitch(MethodNode mth, SwitchNode insn) {
 
 	private static void initClsEnumMap(ClassNode enumCls) {
 		MethodNode clsInitMth = enumCls.getClassInitMth();
-		if (clsInitMth == null || clsInitMth.isNoCode()) {
+		if (clsInitMth == null || clsInitMth.isNoCode() || clsInitMth.getBasicBlocks() == null) {
 			return;
 		}
 		EnumMapAttr mapAttr = new EnumMapAttr();