Merge pull request #3105 from lha/check-for-invalid-plist-error

Handle failing to parse plist

Author: millenomi

Sources/Foundation/PropertyListSerialization.swift

@@ -63,7 +63,8 @@ open class PropertyListSerialization : NSObject {
         var error: Unmanaged<CFError>? = nil
         let decoded = withUnsafeMutablePointer(to: &fmt) { (outFmt: UnsafeMutablePointer<CFPropertyListFormat>) -> AnyObject? in
             withUnsafeMutablePointer(to: &error) { (outErr: UnsafeMutablePointer<Unmanaged<CFError>?>) -> AnyObject? in
-                return CFPropertyListCreateWithData(kCFAllocatorSystemDefault, data._cfObject, CFOptionFlags(CFIndex(opt.rawValue)), outFmt, outErr).takeRetainedValue()
+                let d = CFPropertyListCreateWithData(kCFAllocatorSystemDefault, data._cfObject, CFOptionFlags(CFIndex(opt.rawValue)), outFmt, outErr)
+		return d?.takeRetainedValue()
             }
         }
         format?.pointee = PropertyListFormat(rawValue: UInt(fmt.rawValue))!

Tests/Foundation/Tests/TestPropertyListSerialization.swift

@@ -13,6 +13,7 @@ class TestPropertyListSerialization : XCTestCase {
             ("test_BasicConstruction", test_BasicConstruction),
             ("test_decodeData", test_decodeData),
             ("test_decodeStream", test_decodeStream),
+	    ("test_decodeEmptyData", test_decodeEmptyData),
         ]
     }
 
@@ -79,4 +80,14 @@ class TestPropertyListSerialization : XCTestCase {
             XCTFail("value stored is not a string")
         }
     }
+
+    func test_decodeEmptyData() {
+        XCTAssertThrowsError(try PropertyListSerialization.propertyList(from: Data(), format: nil)) { error in
+            let nserror = error as NSError
+            XCTAssertEqual(nserror.domain, NSCocoaErrorDomain)
+            XCTAssertEqual(CocoaError(_nsError: nserror).code, .propertyListReadCorrupt)
+            XCTAssertEqual(nserror.userInfo[NSDebugDescriptionErrorKey] as? String, "Cannot parse a NULL or zero-length data")
+	}
+
+    }
 }