fix: class resolving issues (#867)

skylot · Feb 29, 2020 · 5eec8f7 · 5eec8f7
1 parent 49a82c8
commit 5eec8f7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/RootNode.java b/jadx-core/src/main/java/jadx/core/dex/nodes/RootNode.java
@@ -176,6 +176,12 @@ public ClassNode resolveClass(ClassInfo clsInfo) {
 
 	@Nullable
 	public ClassNode resolveClass(ArgType clsType) {
+		if (!clsType.isTypeKnown() || clsType.isGenericType()) {
+			return null;
+		}
+		if (clsType.getWildcardBound() == ArgType.WildcardBound.UNBOUND) {
+			return null;
+		}
 		if (clsType.isGeneric()) {
 			clsType = ArgType.object(clsType.getObject());
 		}

diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/utils/MethodUtils.java b/jadx-core/src/main/java/jadx/core/dex/nodes/utils/MethodUtils.java
@@ -68,7 +68,7 @@ public ArgType getMethodGenericReturnType(BaseInvokeNode invokeNode) {
 	}
 
 	public boolean processMethodArgsOverloaded(ArgType startCls, MethodInfo mthInfo, @Nullable List<IMethodDetails> collectedMths) {
-		if (startCls == null) {
+		if (startCls == null || !startCls.isObject()) {
 			return false;
 		}
 		boolean isMthConstructor = mthInfo.isConstructor() || mthInfo.isClassInit();