Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit ad2485b

Browse files
hughbejkotas
authored andcommitted
Fix ArgumentNullException messages passed as parameter names (#2889)
Fixed several ArgumentNullExceptions that throw with the message as the parameter name, leading to potential confusion for developers.
1 parent 7fe0fef commit ad2485b

File tree

9 files changed

+15
-15
lines changed

9 files changed

+15
-15
lines changed

src/mscorlib/src/System/AppDomain.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3289,7 +3289,7 @@ internal static AppDomain InternalCreateDomain(String friendlyName,
32893289
AppDomainSetup info)
32903290
{
32913291
if (friendlyName == null)
3292-
throw new ArgumentNullException(Environment.GetResourceString("ArgumentNull_String"));
3292+
throw new ArgumentNullException("friendlyName", Environment.GetResourceString("ArgumentNull_String"));
32933293

32943294
Contract.EndContractBlock();
32953295

src/mscorlib/src/System/AppDomainManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected static AppDomain CreateDomainHelper (string friendlyName,
5959
Evidence securityInfo,
6060
AppDomainSetup appDomainInfo) {
6161
if (friendlyName == null)
62-
throw new ArgumentNullException(Environment.GetResourceString("ArgumentNull_String"));
62+
throw new ArgumentNullException("friendlyName", Environment.GetResourceString("ArgumentNull_String"));
6363

6464
Contract.EndContractBlock();
6565
// If evidence is provided, we check to make sure that is allowed.

src/mscorlib/src/System/Globalization/DateTimeFormatInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2056,7 +2056,7 @@ public void SetAllDateTimePatterns(String[] patterns, char format)
20562056
{
20572057
if (patterns[i] == null)
20582058
{
2059-
throw new ArgumentNullException(Environment.GetResourceString("ArgumentNull_ArrayValue"));
2059+
throw new ArgumentNullException("patterns[" + i + "]", Environment.GetResourceString("ArgumentNull_ArrayValue"));
20602060
}
20612061
}
20622062

src/mscorlib/src/System/Reflection/FieldInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public abstract class FieldInfo : MemberInfo, _FieldInfo
3636
public static FieldInfo GetFieldFromHandle(RuntimeFieldHandle handle)
3737
{
3838
if (handle.IsNullHandle())
39-
throw new ArgumentException(Environment.GetResourceString("Argument_InvalidHandle"));
39+
throw new ArgumentException(Environment.GetResourceString("Argument_InvalidHandle"), "handle");
4040

4141
FieldInfo f = RuntimeType.GetFieldInfo(handle.GetRuntimeFieldInfo());
4242

src/mscorlib/src/System/Runtime/InteropServices/Marshal.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1060,7 +1060,7 @@ public static IntPtr GetHINSTANCE(Module m)
10601060
}
10611061

10621062
if (rtModule == null)
1063-
throw new ArgumentNullException(Environment.GetResourceString("Argument_MustBeRuntimeModule"));
1063+
throw new ArgumentNullException("m", Environment.GetResourceString("Argument_MustBeRuntimeModule"));
10641064

10651065
return GetHINSTANCE(rtModule.GetNativeHandle());
10661066
}

src/mscorlib/src/System/Security/Policy/ApplicationTrust.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public ApplicationTrust(PermissionSet defaultGrantSet, IEnumerable<StrongName> f
9191
List<StrongName> fullTrustList = new List<StrongName>();
9292
foreach (StrongName strongName in fullTrustAssemblies) {
9393
if (strongName == null) {
94-
throw new ArgumentException(Environment.GetResourceString("Argument_NullFullTrustAssembly"));
94+
throw new ArgumentException(Environment.GetResourceString("Argument_NullFullTrustAssembly"), "fullTrustAssemblies");
9595
}
9696

9797
fullTrustList.Add(new StrongName(strongName.PublicKey, strongName.Name, strongName.Version));
@@ -120,7 +120,7 @@ public ApplicationIdentity ApplicationIdentity {
120120
}
121121
set {
122122
if (value == null)
123-
throw new ArgumentNullException(Environment.GetResourceString("Argument_InvalidAppId"));
123+
throw new ArgumentNullException("value", Environment.GetResourceString("Argument_InvalidAppId"));
124124
Contract.EndContractBlock();
125125
m_appId = value;
126126
}

src/mscorlib/src/System/StubHelpers.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,7 +1670,7 @@ static internal IntPtr SafeHandleAddRef(SafeHandle pHandle, ref bool success)
16701670
{
16711671
if (pHandle == null)
16721672
{
1673-
throw new ArgumentNullException(Environment.GetResourceString("ArgumentNull_SafeHandle"));
1673+
throw new ArgumentNullException("pHandle", Environment.GetResourceString("ArgumentNull_SafeHandle"));
16741674
}
16751675
Contract.EndContractBlock();
16761676

@@ -1686,7 +1686,7 @@ static internal void SafeHandleRelease(SafeHandle pHandle)
16861686
{
16871687
if (pHandle == null)
16881688
{
1689-
throw new ArgumentNullException(Environment.GetResourceString("ArgumentNull_SafeHandle"));
1689+
throw new ArgumentNullException("pHandle", Environment.GetResourceString("ArgumentNull_SafeHandle"));
16901690
}
16911691
Contract.EndContractBlock();
16921692

src/mscorlib/src/System/Text/StringBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,7 @@ public StringBuilder Insert(int index, char[] value, int startIndex, int charCou
11081108
{
11091109
return this;
11101110
}
1111-
throw new ArgumentNullException(Environment.GetResourceString("ArgumentNull_String"));
1111+
throw new ArgumentNullException("value", Environment.GetResourceString("ArgumentNull_String"));
11121112
}
11131113

11141114
//Range check the array.

src/mscorlib/src/System/Threading/WaitHandle.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ public static bool WaitAll(WaitHandle[] waitHandles, int millisecondsTimeout, bo
281281
{
282282
if (waitHandles == null)
283283
{
284-
throw new ArgumentNullException(Environment.GetResourceString("ArgumentNull_Waithandles"));
284+
throw new ArgumentNullException("waitHandles", Environment.GetResourceString("ArgumentNull_Waithandles"));
285285
}
286286
if(waitHandles.Length == 0)
287287
{
@@ -297,7 +297,7 @@ public static bool WaitAll(WaitHandle[] waitHandles, int millisecondsTimeout, bo
297297
#if FEATURE_CORECLR
298298
throw new ArgumentException(Environment.GetResourceString("Argument_EmptyWaithandleArray"));
299299
#else
300-
throw new ArgumentNullException(Environment.GetResourceString("Argument_EmptyWaithandleArray"));
300+
throw new ArgumentNullException("waitHandles", Environment.GetResourceString("Argument_EmptyWaithandleArray"));
301301
#endif
302302
}
303303
if (waitHandles.Length > MAX_WAITHANDLES)
@@ -315,7 +315,7 @@ public static bool WaitAll(WaitHandle[] waitHandles, int millisecondsTimeout, bo
315315
WaitHandle waitHandle = waitHandles[i];
316316

317317
if (waitHandle == null)
318-
throw new ArgumentNullException(Environment.GetResourceString("ArgumentNull_ArrayElement"));
318+
throw new ArgumentNullException("waitHandles[" + i + "]", Environment.GetResourceString("ArgumentNull_ArrayElement"));
319319

320320
#if FEATURE_REMOTING
321321
if (RemotingServices.IsTransparentProxy(waitHandle))
@@ -394,7 +394,7 @@ public static int WaitAny(WaitHandle[] waitHandles, int millisecondsTimeout, boo
394394
{
395395
if (waitHandles==null)
396396
{
397-
throw new ArgumentNullException(Environment.GetResourceString("ArgumentNull_Waithandles"));
397+
throw new ArgumentNullException("waitHandles", Environment.GetResourceString("ArgumentNull_Waithandles"));
398398
}
399399
if(waitHandles.Length == 0)
400400
{
@@ -415,7 +415,7 @@ public static int WaitAny(WaitHandle[] waitHandles, int millisecondsTimeout, boo
415415
WaitHandle waitHandle = waitHandles[i];
416416

417417
if (waitHandle == null)
418-
throw new ArgumentNullException(Environment.GetResourceString("ArgumentNull_ArrayElement"));
418+
throw new ArgumentNullException("waitHandles[" + i + "]", Environment.GetResourceString("ArgumentNull_ArrayElement"));
419419

420420
#if FEATURE_REMOTING
421421
if (RemotingServices.IsTransparentProxy(waitHandle))

0 commit comments

Comments
 (0)