Merge pull request swiftlang#2663 from compnerd/ceci-nest-pas-une-directoire

CoreFoundation: handle `isDirectory` properly in `WindowsPathToURLPath`

Author: compnerd

Diff for: CoreFoundation/URL.subproj/CFURL.c

@@ -3977,6 +3977,13 @@ static CFArrayRef WindowsPathToURLComponents(CFStringRef path, CFAllocatorRef al
     urlComponents = CFArrayCreateMutableCopy(alloc, 0, tmp);
     CFRelease(tmp);
 
+    if (isDir == FALSE) {
+      CFIndex last = CFArrayGetCount(urlComponents) - 1;
+      if (CFEqual(CFArrayGetValueAtIndex(urlComponents, last), CFSTR(""))) {
+        CFArrayRemoveValueAtIndex(urlComponents, last);
+      }
+    }
+
     CFStringRef str = (CFStringRef)CFArrayGetValueAtIndex(urlComponents, 0);
     if (isAbsolute && CFStringGetLength(str) == 2 && CFStringGetCharacterAtIndex(str, 1) == ':') {
         i = 1; // Skip over the drive letter