fix: method info cache error (#868)

skylot · Feb 29, 2020 · 49a82c8 · 49a82c8
1 parent 26bad4a
commit 49a82c8
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/jadx-core/src/main/java/jadx/core/dex/info/InfoStorage.java b/jadx-core/src/main/java/jadx/core/dex/info/InfoStorage.java
@@ -26,20 +26,22 @@ public ClassInfo putCls(ClassInfo cls) {
 		}
 	}
 
-	private int generateMethodLookupId(DexNode dex, int mthId) {
+	private static int generateMethodLookupId(DexNode dex, int mthId) {
 		return dex.getDexId() << 16 | mthId;
 	}
 
 	public MethodInfo getMethod(DexNode dex, int mtdId) {
-		return methods.get(generateMethodLookupId(dex, mtdId));
+		synchronized (methods) {
+			return methods.get(generateMethodLookupId(dex, mtdId));
+		}
 	}
 
 	public MethodInfo putMethod(DexNode dex, int mthId, MethodInfo methodInfo) {
 		synchronized (methods) {
 			MethodInfo uniqueMethodInfo = putMethod(methodInfo);
 			MethodInfo prev = methods.put(generateMethodLookupId(dex, mthId), uniqueMethodInfo);
-			if (prev != null) {
-				throw new JadxRuntimeException("Method info already added: " + methodInfo);
+			if (prev != null && prev != uniqueMethodInfo) {
+				throw new JadxRuntimeException("Method lookup id collision: " + methodInfo + ", " + prev + ", " + uniqueMethodInfo);
 			}
 			return uniqueMethodInfo;
 		}