Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix NullReferenceException in Timer disposal #5321

Merged
merged 2 commits into from
Aug 2, 2024
Merged

Fix NullReferenceException in Timer disposal #5321

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b464ed
Fix NullReferenceException in Timer disposal
martincostello Jul 31, 2024
b865bab
Guard against null in Timer.Change()
martincostello Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/Libraries/Microsoft.Extensions.TimeProvider.Testing/Timer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,18 @@ public bool Change(TimeSpan dueTime, TimeSpan period)
_ = Throw.IfOutOfRange(periodMs, -1, MaxSupportedTimeout, nameof(period));
#pragma warning restore S3236 // Caller information arguments should not be provided explicitly

if (_timeProvider == null)
var timeProvider = _timeProvider;
if (timeProvider is null)
{
// timer has been disposed
return false;
}

if (_waiter != null)
var waiter = _waiter;
if (waiter is not null)
{
// remove any previous waiter
_timeProvider.RemoveWaiter(_waiter);
timeProvider.RemoveWaiter(waiter);
_waiter = null;
}

Expand All @@ -62,8 +64,8 @@ public bool Change(TimeSpan dueTime, TimeSpan period)
period = TimeSpan.Zero;
}

_waiter = new Waiter(_callback!, _state, period.Ticks);
_timeProvider.AddWaiter(_waiter, dueTime.Ticks);
_waiter = waiter = new Waiter(_callback!, _state, period.Ticks);
timeProvider.AddWaiter(waiter, dueTime.Ticks);
return true;
}

Expand All @@ -89,9 +91,10 @@ public ValueTask DisposeAsync()

private void Dispose(bool _)
{
if (_waiter != null)
var waiter = _waiter;
if (waiter is not null)
{
_timeProvider!.RemoveWaiter(_waiter);
_timeProvider?.RemoveWaiter(waiter);
_waiter = null;
}

Expand Down