Merge branch 'main' into dev/grendel/native-tracing

* main: [Mono.Android] fix potential leak of RunnableImplementors (#8900)
dotnet · Apr 25, 2024 · 8df0ef2 · 8df0ef2
2 parents c9e5ebd + 3ce27c9
commit 8df0ef2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Mono.Android/Java.Lang/Thread.cs b/src/Mono.Android/Java.Lang/Thread.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 using Android.Runtime;
@@ -27,7 +28,7 @@ public RunnableImplementor (Action handler, bool removable)
 				this.removable = removable;
 				if (removable)
 					lock (instances)
-						instances [handler] = this;
+						instances.AddOrUpdate (handler, this);
 			}
 
 			public void Run ()
@@ -41,7 +42,7 @@ public void Run ()
 				Dispose ();
 			}
 
-			static Dictionary<Action, RunnableImplementor> instances = new Dictionary<Action, RunnableImplementor> ();
+			static ConditionalWeakTable<Action, RunnableImplementor> instances = new ();
 
 			public static RunnableImplementor Remove (Action handler)
 			{