Skip to content
This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Fix argument checks in ThreadPool.RegisterWaitForSingleObject. #6887

Merged
jkotas merged 1 commit into from
Jan 24, 2019
Merged

Fix argument checks in ThreadPool.RegisterWaitForSingleObject. #6887

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions src/System.Private.CoreLib/shared/System/Threading/ThreadPool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ internal static class ThreadPoolGlobals
}

[StructLayout(LayoutKind.Sequential)] // enforce layout so that padding reduces false sharing
internal sealed partial class ThreadPoolWorkQueue
internal sealed class ThreadPoolWorkQueue
{
internal static class WorkStealingQueueList
{
Expand Down Expand Up @@ -943,7 +943,7 @@ public static RegisteredWaitHandle RegisterWaitForSingleObject(
)
{
if (millisecondsTimeOutInterval > (uint)int.MaxValue && millisecondsTimeOutInterval != uint.MaxValue)
throw new ArgumentOutOfRangeException(nameof(millisecondsTimeOutInterval), SR.ArgumentOutOfRange_NeedNonNegOrNegative1);
throw new ArgumentOutOfRangeException(nameof(millisecondsTimeOutInterval), SR.ArgumentOutOfRange_LessEqualToIntegerMaxVal);
return RegisterWaitForSingleObject(waitObject, callBack, state, millisecondsTimeOutInterval, executeOnlyOnce, true);
}

Expand Down Expand Up @@ -997,6 +997,8 @@ public static RegisteredWaitHandle RegisterWaitForSingleObject(
{
if (millisecondsTimeOutInterval < -1)
throw new ArgumentOutOfRangeException(nameof(millisecondsTimeOutInterval), SR.ArgumentOutOfRange_NeedNonNegOrNegative1);
if (millisecondsTimeOutInterval > (uint)int.MaxValue)
throw new ArgumentOutOfRangeException(nameof(millisecondsTimeOutInterval), SR.ArgumentOutOfRange_LessEqualToIntegerMaxVal);
return RegisterWaitForSingleObject(waitObject, callBack, state, (uint)millisecondsTimeOutInterval, executeOnlyOnce, true);
}

Expand All @@ -1010,6 +1012,8 @@ public static RegisteredWaitHandle UnsafeRegisterWaitForSingleObject(
{
if (millisecondsTimeOutInterval < -1)
throw new ArgumentOutOfRangeException(nameof(millisecondsTimeOutInterval), SR.ArgumentOutOfRange_NeedNonNegOrNegative1);
if (millisecondsTimeOutInterval > (uint)int.MaxValue)
throw new ArgumentOutOfRangeException(nameof(millisecondsTimeOutInterval), SR.ArgumentOutOfRange_LessEqualToIntegerMaxVal);
return RegisterWaitForSingleObject(waitObject, callBack, state, (uint)millisecondsTimeOutInterval, executeOnlyOnce, false);
}

Expand Down