actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-11 04:46:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix null ref exception in SecretMasker caused by hashfiles timeout. (#516)

Browse Source
This commit is contained in:
Tingluo Huang
2020-06-05 23:02:10 -04:00
committed by GitHub
parent c4626d0c3a
commit 3c5aef791c
3 changed files with 229 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Runner.Sdk/ProcessInvoker.cs
View File

@@ -318,7 +318,12 @@ namespace GitHub.Runner.Sdk
}
}
using (var registration = cancellationToken.Register(async () => await CancelAndKillProcessTree(killProcessOnCancel)))
var cancellationFinished = new TaskCompletionSource<bool>();
using (var registration = cancellationToken.Register(async () =>
{
await CancelAndKillProcessTree(killProcessOnCancel);
cancellationFinished.TrySetResult(true);
}))
{
Trace.Info($"Process started with process id {_proc.Id}, waiting for process exit.");
while (true)
@@ -344,6 +349,13 @@ namespace GitHub.Runner.Sdk
Trace.Info($"Finished process {_proc.Id} with exit code {_proc.ExitCode}, and elapsed time {_stopWatch.Elapsed}.");
}
if (cancellationToken.IsCancellationRequested)
{
// Ensure cancellation also finish on the cancellationToken.Register thread.
await cancellationFinished.Task;
Trace.Info($"Process Cancellation finished.");
}
cancellationToken.ThrowIfCancellationRequested();
// Wait for process to finish.