Merge pull request #253 from brownleej/url-encoding-fix

Adds nullability annotations to _CFStringCreateByRemovingPercentEncoding

Author: phausler

CoreFoundation/URL.subproj/CFURLComponents.h

@@ -89,7 +89,7 @@ CF_EXPORT CFRange _CFURLComponentsGetRangeOfQuery(CFURLComponentsRef components)
 CF_EXPORT CFRange _CFURLComponentsGetRangeOfFragment(CFURLComponentsRef components);
 
 CF_EXPORT CFStringRef _CFStringCreateByAddingPercentEncodingWithAllowedCharacters(CFAllocatorRef alloc, CFStringRef string, CFCharacterSetRef allowedCharacters);
-CF_EXPORT CFStringRef _CFStringCreateByRemovingPercentEncoding(CFAllocatorRef alloc, CFStringRef string);
+CF_EXPORT CFStringRef _Nullable _CFStringCreateByRemovingPercentEncoding(CFAllocatorRef alloc, CFStringRef string);
 
 // These return singletons
 CF_EXPORT CFCharacterSetRef _CFURLComponentsGetURLUserAllowedCharacterSet();

Foundation/NSURL.swift

@@ -445,7 +445,7 @@ extension NSString {
 
     // Returns a new string made from the receiver by replacing all percent encoded sequences with the matching UTF-8 characters.
     public var stringByRemovingPercentEncoding: String? {
-        return _CFStringCreateByRemovingPercentEncoding(kCFAllocatorSystemDefault, self._cfObject)._swiftObject
+        return _CFStringCreateByRemovingPercentEncoding(kCFAllocatorSystemDefault, self._cfObject)?._swiftObject
     }
 }
 

TestFoundation/TestNSString.swift

@@ -77,6 +77,7 @@ class TestNSString : XCTestCase {
             ("test_stringByResolvingSymlinksInPath", test_stringByResolvingSymlinksInPath),
             ("test_stringByExpandingTildeInPath", test_stringByExpandingTildeInPath),
             ("test_stringByStandardizingPath", test_stringByStandardizingPath),
+            ("test_stringByRemovingPercentEncoding", test_stringByRemovingPercentEncoding),
             ("test_ExternalRepresentation", test_ExternalRepresentation),
             ("test_mutableStringConstructor", test_mutableStringConstructor),
             ("test_PrefixSuffix", test_PrefixSuffix),
@@ -824,6 +825,13 @@ class TestNSString : XCTestCase {
             XCTAssertEqual(result, path.bridge(), "parent links could not be resolved for relative paths")
         }
     }
+
+    func test_stringByRemovingPercentEncoding() {
+        let s1 = "a%20b".stringByRemovingPercentEncoding
+        XCTAssertEqual(s1, "a b")
+        let s2 = "a%1 b".stringByRemovingPercentEncoding
+        XCTAssertNil(s2, "returns nil for a string with an invalid percent encoding")
+    }
 
     func test_ExternalRepresentation() {
         // Ensure NSString can be used to create an external data representation