WhiteSpace and PrefixParent subdirectory names throw exception by Anipik · Pull Request #27810 · dotnet/corefx

Anipik · 2018-03-07T06:14:13Z

Fixes #25755

…ateSubDirectory

danmoseley · 2018-03-07T06:27:26Z

src/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs

            string fullPath = Path.GetFullPath(Path.Combine(FullPath, path));

-            if (0 != string.Compare(FullPath, 0, fullPath, 0, FullPath.Length, PathInternal.StringComparison))
+            if (0 != string.Compare(FullPath, 0, fullPath, 0, FullPath.Length, PathInternal.StringComparison) 


If yo'ure changing this you can fix the Yoda conditional. Better still, change to string.Equals instead. It can be faster (eg if strings are different lengths it bails immediately)

String.Equals does not have any overload to match a string with a substring of second string.

I missed that, you're right. Maybe there should be a STring.Equals(Span, Span)...

danmoseley · 2018-03-07T06:29:46Z

src/System.IO.FileSystem/tests/DirectoryInfo/CreateSubdirectory.cs

+        public void ParentDirectoryNameAsPrefix()
+        {
+            string randomName = GetTestFileName();
+            var di = new DirectoryInfo(Path.Combine(TestDirectory, randomName));


simpler to write Directory.CreateDirectory(Path.Combine(TestDirectory, randomName))?

danmoseley · 2018-03-07T06:30:00Z

src/System.IO.FileSystem/tests/DirectoryInfo/CreateSubdirectory.cs


+        [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
+        public void ParentDirectoryNameAsPrefix()


ParentDirectoryNameAsPrefixShouldThrow ?

danmoseley · 2018-03-07T06:30:13Z

src/System.IO.FileSystem/tests/DirectoryInfo/CreateSubdirectory.cs

            MemberData(nameof(SimpleWhiteSpace))]
-        [PlatformSpecific(TestPlatforms.Windows)]  // Simple whitespace is trimmed in path
+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
+        public void WindowsSimpleWhiteSpaceThrowException(string component)


ThrowsException

danmoseley

Jeremy should signoff as I dno't have full context.

danmoseley · 2018-03-07T16:15:10Z

@dotnet-bot test NETFX x86 Release Build please (fixed hang)

danmoseley · 2018-03-07T16:17:23Z

@Anipik the Linux failures are real.

JeremyKuhne · 2018-03-07T20:16:20Z

src/System.IO.FileSystem/src/System/IO/DirectoryInfo.cs


-            if (0 != string.Compare(FullPath, 0, fullPath, 0, FullPath.Length, PathInternal.StringComparison))
+            if (string.Compare(FullPath, 0, fullPath, 0, FullPath.Length, PathInternal.StringComparison) != 0
+                || fullPath.Length < FullPath.Length 


Do the faster checks first. string.Compare should be last.

JeremyKuhne · 2018-03-07T20:22:02Z

src/System.IO.FileSystem/tests/DirectoryInfo/CreateSubdirectory.cs

+            string randomName = GetTestFileName();
+            DirectoryInfo di = Directory.CreateDirectory(Path.Combine(TestDirectory, randomName));
+
+            Assert.Throws<ArgumentException>(() => di.CreateSubdirectory(@".." + Path.DirectorySeparatorChar  + randomName + @"abc" + Path.DirectorySeparatorChar + GetTestFileName()));


You can use Path.Combine here for clarity

…t#27810)

This broke with dotnet#27810. Reworked the logic in an attempt to be clearer and added test cases. This addresses #30283.

#30293) * Fix creating subdirectories under directories with trailing separators This broke with #27810. Reworked the logic in an attempt to be clearer and added test cases. This addresses #30283. * Flip the logic to make it a little easier to follow. (Reduces the number of nots.) * Skip new test on desktop

dotnet#30293) * Fix creating subdirectories under directories with trailing separators This broke with dotnet#27810. Reworked the logic in an attempt to be clearer and added test cases. This addresses #30283. * Flip the logic to make it a little easier to follow. (Reduces the number of nots.) * Skip new test on desktop

…o.CreateSubDirectory Change to use Directory.CreateDirectory because of regression introduced by dotnet/corefx#27810 in creating a subdirectory under root path.

#30293) * Fix creating subdirectories under directories with trailing separators This broke with #27810. Reworked the logic in an attempt to be clearer and added test cases. This addresses #30283. * Flip the logic to make it a little easier to follow. (Reduces the number of nots.) * Skip new test on desktop

…t/corefx#27810) Commit migrated from dotnet/corefx@59f6987

dotnet/corefx#30293) * Fix creating subdirectories under directories with trailing separators This broke with dotnet/corefx#27810. Reworked the logic in an attempt to be clearer and added test cases. This addresses dotnet/corefx#30283. * Flip the logic to make it a little easier to follow. (Reduces the number of nots.) * Skip new test on desktop Commit migrated from dotnet/corefx@4a6f54e

Simple white Space and PrefixParentDirectory names not allowed in cre…

d713d89

…ateSubDirectory

Anipik requested review from JeremyKuhne and danmoseley March 7, 2018 06:14

danmoseley reviewed Mar 7, 2018

View reviewed changes

danmoseley approved these changes Mar 7, 2018

View reviewed changes

Minor Tweeks

42e2c89

Anipik added 2 commits March 7, 2018 11:01

unix white space test added

e1c32f0

Correcting prefix test for unix

0df5593

JeremyKuhne reviewed Mar 7, 2018

View reviewed changes

Anipik added 2 commits March 7, 2018 12:22

Faster check first

5835a2e

use Path.Combine

c2591d6

JeremyKuhne approved these changes Mar 8, 2018

View reviewed changes

Anipik merged commit 59f6987 into dotnet:master Mar 8, 2018

caesar-chen pushed a commit to caesar-chen/corefx that referenced this pull request Mar 8, 2018

WhiteSpace and PrefixParent subdirectory names throw exception (dotne…

21b138b

…t#27810)

karelz added this to the 2.1.0 milestone Mar 10, 2018

Anipik deleted the CreateSub branch March 24, 2018 01:33

JeremyKuhne mentioned this pull request Jun 11, 2018

Fix creating subdirectories under directories with trailing separators #30293

Merged

JeremyKuhne mentioned this pull request Jun 13, 2018

Fix creating subdirectories under directories with trailing separator… #30367

Merged

daxian-dbw mentioned this pull request Jan 31, 2020

DirectoryInfo.CreateSubdirectory fails in .NET Core 2.1 when DirectoryInfo path ends in separator dotnet/runtime#26448

Closed

picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022

WhiteSpace and PrefixParent subdirectory names throw exception (dotne…

b543c3e

…t/corefx#27810) Commit migrated from dotnet/corefx@59f6987

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WhiteSpace and PrefixParent subdirectory names throw exception#27810

WhiteSpace and PrefixParent subdirectory names throw exception#27810
Anipik merged 6 commits intodotnet:masterfrom
Anipik:CreateSub

Anipik commented Mar 7, 2018

Uh oh!

danmoseley Mar 7, 2018

Uh oh!

Anipik Mar 7, 2018

Uh oh!

danmoseley Mar 7, 2018

Uh oh!

danmoseley Mar 7, 2018

Uh oh!

danmoseley Mar 7, 2018

Uh oh!

danmoseley Mar 7, 2018

Uh oh!

danmoseley left a comment

Uh oh!

danmoseley commented Mar 7, 2018

Uh oh!

danmoseley commented Mar 7, 2018

Uh oh!

JeremyKuhne Mar 7, 2018

Uh oh!

JeremyKuhne Mar 7, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

Anipik commented Mar 7, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

danmoseley left a comment

Choose a reason for hiding this comment

Uh oh!

danmoseley commented Mar 7, 2018

Uh oh!

danmoseley commented Mar 7, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants