This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
Bug in GetFullPath(basePath, Path) #16598
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JeremyKuhne
reviewed
Feb 27, 2018
| @@ -99,7 +99,7 @@ public static string GetFullPath(string path, string basePath) | |||
| // No matching root, root to specified drive | |||
| // "D:Foo" and "C:\Bar" => "D:Foo" | |||
| // "D:\Foo" and "\\?\C:\Bar" => "\\?\D:\Foo" | |||
There was a problem hiding this comment.
It should be "D:Foo" and "\\?\C:\Bar" => "\\?\D:\Foo"
JeremyKuhne
reviewed
Feb 27, 2018
| @@ -99,7 +99,7 @@ public static string GetFullPath(string path, string basePath) | |||
| // No matching root, root to specified drive | |||
| // "D:Foo" and "C:\Bar" => "D:Foo" | |||
| // "D:\Foo" and "\\?\C:\Bar" => "\\?\D:\Foo" | |||
| combinedPath = path.Insert(2, "\\"); | |||
| combinedPath = PathInternal.IsDevice(basePath) ? basePath.Substring(0,4) + path.Insert(2, "\\") : path.Insert(2, "\\"); | |||
There was a problem hiding this comment.
You could save some allocations by using CombineNoChecksInternal(). If you take a span and slice it on the original string you can end up with "C:" and "foo". Then you can slice basepath as well if you need the third one.
There was a problem hiding this comment.
Note that your other CombineNoChecks usages should probably be CombineNoChecksInternal. I don't think you want the rooting behavior.
JeremyKuhne
reviewed
Feb 27, 2018
| // "D:\Foo" and "\\?\C:\Bar" => "\\?\D:\Foo" | ||
| combinedPath = path.Insert(2, "\\"); | ||
| // "D:Foo" and "\\?\C:\Bar" => "\\?\D:\Foo" | ||
| combinedPath = PathInternal.IsDevice(basePath) ? CombineNoChecksInternal(basePath.AsSpan().Slice(0, 4), path.AsSpan().Slice(0, 2), "\\", path.AsSpan().Slice(2)) : path.Insert(2, "\\"); |
There was a problem hiding this comment.
Nit- it would be easier to read if "\\" was changed to @"\"
JeremyKuhne
approved these changes
Feb 27, 2018
dotnet-bot
pushed a commit
to dotnet/corert
that referenced
this pull request
Feb 28, 2018
* GetFullPath and GetRootLength Corrected * Removed getpathroot * using span * "\\" changed to @"\" Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
jkotas
pushed a commit
to dotnet/corert
that referenced
this pull request
Feb 28, 2018
* GetFullPath and GetRootLength Corrected * Removed getpathroot * using span * "\\" changed to @"\" Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
A-And
pushed a commit
to A-And/coreclr
that referenced
this pull request
Feb 28, 2018
* GetFullPath and GetRootLength Corrected * Removed getpathroot * using span * "\\" changed to @"\"
dotnet-bot
pushed a commit
to dotnet/corefx
that referenced
this pull request
Feb 28, 2018
* GetFullPath and GetRootLength Corrected * Removed getpathroot * using span * "\\" changed to @"\" Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
ahsonkhan
pushed a commit
to dotnet/corefx
that referenced
this pull request
Mar 1, 2018
* GetFullPath and GetRootLength Corrected * Removed getpathroot * using span * "\\" changed to @"\" Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
kbaladurin
pushed a commit
to kbaladurin/corert
that referenced
this pull request
Mar 15, 2018
* GetFullPath and GetRootLength Corrected * Removed getpathroot * using span * "\\" changed to @"\" Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change corrects the Case when base path is a device path and path is a specific drive relative path