Merge pull request #1346 from AArnott/fixserializedTaskLeak

Fix `JoinableTaskContext.serializedTasks` memory leak
microsoft · Aug 13, 2024 · 243b960 · 243b960
2 parents cc929f4 + a47707d
commit 243b960
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Microsoft.VisualStudio.Threading/JoinableTask.cs b/src/Microsoft.VisualStudio.Threading/JoinableTask.cs
@@ -927,10 +927,14 @@ internal void Complete(Task wrappedTask)
             {
                 if (!this.IsCompleteRequested)
                 {
+                    // This must be done *before* setting IsCompleteRequested so that the TaskId property will still return the value we need.
+                    ulong? taskId = this.token?.TaskId;
+
                     this.IsCompleteRequested = true;
-                    if (this.token?.TaskId is ulong taskId)
+
+                    if (taskId.HasValue)
                     {
-                        this.JoinableTaskContext.RemoveSerializableIdentifier(taskId);
+                        this.JoinableTaskContext.RemoveSerializableIdentifier(taskId.Value);
                     }
 
                     if (this.mainThreadQueue is object)