summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorViktor Hofer <viktor.hofer@microsoft.com>2017-05-04 23:11:33 +0200
committerGitHub <noreply@github.com>2017-05-04 23:11:33 +0200
commit8e99cd8031b2f568ea69116e7cf96d55e32cb7f5 (patch)
tree15af12174d8aa965d966c833904036f68def54b6 /src
parentbae3ded1b302abdb1d0b46346f03162bddadba40 (diff)
downloadcoreclr-8e99cd8031b2f568ea69116e7cf96d55e32cb7f5.tar.gz
coreclr-8e99cd8031b2f568ea69116e7cf96d55e32cb7f5.tar.bz2
coreclr-8e99cd8031b2f568ea69116e7cf96d55e32cb7f5.zip
System.IO.Path.GetPathRoot string.Empty or whitespace character string should throw ArgumentException (#11387)
* GetPathRoot string.Empty and string whitespace throws ArgumentException * throw in next line * Refined method description * Unix impl adjusted * Indentation * pr feedback * Delete Path.Unix.cs * Adding param to ArgumentException
Diffstat (limited to 'src')
-rw-r--r--src/mscorlib/shared/System/IO/Path.Unix.cs9
-rw-r--r--src/mscorlib/shared/System/IO/Path.Windows.cs6
2 files changed, 12 insertions, 3 deletions
diff --git a/src/mscorlib/shared/System/IO/Path.Unix.cs b/src/mscorlib/shared/System/IO/Path.Unix.cs
index 500c60aa8c..68c5f70036 100644
--- a/src/mscorlib/shared/System/IO/Path.Unix.cs
+++ b/src/mscorlib/shared/System/IO/Path.Unix.cs
@@ -23,7 +23,7 @@ namespace System.IO
throw new ArgumentNullException(nameof(path));
if (path.Length == 0)
- throw new ArgumentException(SR.Arg_PathIllegal);
+ throw new ArgumentException(SR.Arg_PathIllegal, nameof(path));
PathInternal.CheckInvalidPathChars(path);
@@ -193,10 +193,15 @@ namespace System.IO
return path.Length > 0 && path[0] == PathInternal.DirectorySeparatorChar;
}
+ // The resulting string is null if path is null. If the path is empty or
+ // only contains whitespace characters an ArgumentException gets thrown.
public static string GetPathRoot(string path)
{
if (path == null) return null;
- return IsPathRooted(path) ? PathInternal.DirectorySeparatorCharAsString : String.Empty;
+ if (string.IsNullOrWhiteSpace(path))
+ throw new ArgumentException(SR.Arg_PathIllegal, nameof(path));
+
+ return IsPathRooted(path) ? PathInternal.DirectorySeparatorCharAsString : String.Empty;
}
/// <summary>Gets whether the system is case-sensitive.</summary>
diff --git a/src/mscorlib/shared/System/IO/Path.Windows.cs b/src/mscorlib/shared/System/IO/Path.Windows.cs
index d6f0c628c3..1e573cd95d 100644
--- a/src/mscorlib/shared/System/IO/Path.Windows.cs
+++ b/src/mscorlib/shared/System/IO/Path.Windows.cs
@@ -136,10 +136,14 @@ namespace System.IO
// path on the current drive), "X:" (a relative path on a given drive,
// where X is the drive letter), "X:\" (an absolute path on a given drive),
// and "\\server\share" (a UNC path for a given server and share name).
- // The resulting string is null if path is null.
+ // The resulting string is null if path is null. If the path is empty or
+ // only contains whitespace characters an ArgumentException gets thrown.
public static string GetPathRoot(string path)
{
if (path == null) return null;
+ if (string.IsNullOrWhiteSpace(path))
+ throw new ArgumentException(SR.Arg_PathIllegal, nameof(path));
+
PathInternal.CheckInvalidPathChars(path);
// Need to return the normalized directory separator