Always dispose cancellation token sources (#926)

hardkoded · Feb 21, 2019 · 7a1de99 · 7a1de99
1 parent 4271b97
commit 7a1de99
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/lib/PuppeteerSharp/Helpers/TaskHelper.cs b/lib/PuppeteerSharp/Helpers/TaskHelper.cs
@@ -93,20 +93,21 @@ public static async Task<T> WithTimeout<T>(
         private static async Task<bool> TimeoutTask(Task task, int milliseconds)
         {
             var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-            var cancellationToken = new CancellationTokenSource();
-
-            if (milliseconds > 0)
-            {
-                cancellationToken.CancelAfter(milliseconds);
-            }
-            using (cancellationToken.Token.Register(s => ((TaskCompletionSource<bool>)s).TrySetResult(true), tcs))
+            using (var cancellationToken = new CancellationTokenSource())
             {
-                if (task != await Task.WhenAny(task, tcs.Task))
+                if (milliseconds > 0)
+                {
+                    cancellationToken.CancelAfter(milliseconds);
+                }
+                using (cancellationToken.Token.Register(s => ((TaskCompletionSource<bool>)s).TrySetResult(true), tcs))
                 {
-                    return true;
+                    if (task != await Task.WhenAny(task, tcs.Task))
+                    {
+                        return true;
+                    }
                 }
+                return false;
             }
-            return false;
         }
     }
 }