Fix an issue with a Stack Overflow if a method has a lambda that refe…

…rences itself as a lambda
QuiltMC · Feb 8, 2023 · ee95c91 · ee95c91
1 parent 1ce4aef
commit ee95c91
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ allprojects {
     group = 'org.quiltmc.unpick'
 
     def ENV = System.getenv()
-    version = "3.0.5" + (ENV.SNAPSHOTS_URL ? "-SNAPSHOT" : "")
+    version = "3.0.6" + (ENV.SNAPSHOTS_URL ? "-SNAPSHOT" : "")
     version = version + (ENV.GITHUB_ACTIONS ? "" : "+local")
 
     sourceCompatibility = 1.8

diff --git a/src/main/java/daomephsta/unpick/api/ConstantUninliner.java b/src/main/java/daomephsta/unpick/api/ConstantUninliner.java
@@ -274,7 +274,12 @@ private Consumer<Context> processUsage(String methodOwner, MethodNode enclosingM
 				String samOwner = Type.getMethodType(invokeDynamic.desc).getReturnType().getInternalName();
 				String samName = invokeDynamic.name;
 				String samDesc = ((Type) invokeDynamic.bsmArgs[0]).getDescriptor();
-				lambdaSAMs.put(MethodTriple.fromHandle(implementation), new MethodTriple(samOwner, samName, samDesc));
+				MethodTriple old = lambdaSAMs.put(MethodTriple.fromHandle(implementation), new MethodTriple(samOwner, samName, samDesc));
+
+				if (old != null) {
+					return null;
+				}
+
 				if (lambdaOwner.name.equals(methodOwner) && lambda.name.equals(enclosingMethod.name)) {
 					return null;
 				}