Fix memory leak in PropertyListSerialization

drexin · drexin · commit aeaaaca26ab2 · 2021-07-23T10:34:53.000-07:00
rdar://80919378
diff --git a/Sources/Foundation/PropertyListSerialization.swift b/Sources/Foundation/PropertyListSerialization.swift
@@ -63,7 +63,7 @@ open class PropertyListSerialization : NSObject {
         var error: Unmanaged<CFError>? = nil
         let decoded = withUnsafeMutablePointer(to: &fmt) { (outFmt: UnsafeMutablePointer<CFPropertyListFormat>) -> NSObject? in
             withUnsafeMutablePointer(to: &error) { (outErr: UnsafeMutablePointer<Unmanaged<CFError>?>) -> NSObject? in
-                return unsafeBitCast(CFPropertyListCreateWithData(kCFAllocatorSystemDefault, data._cfObject, CFOptionFlags(CFIndex(opt.rawValue)), outFmt, outErr), to: NSObject.self)
+                return CFPropertyListCreateWithData(kCFAllocatorSystemDefault, data._cfObject, CFOptionFlags(CFIndex(opt.rawValue)), outFmt, outErr).takeRetainedValue()
             }
         }
         format?.pointee = PropertyListFormat(rawValue: UInt(fmt.rawValue))!
@@ -79,7 +79,7 @@ open class PropertyListSerialization : NSObject {
         var error: Unmanaged<CFError>? = nil
         let decoded = withUnsafeMutablePointer(to: &fmt) { (outFmt: UnsafeMutablePointer<CFPropertyListFormat>) -> NSObject? in
             withUnsafeMutablePointer(to: &error) { (outErr: UnsafeMutablePointer<Unmanaged<CFError>?>) -> NSObject? in
-                return unsafeBitCast(CFPropertyListCreateWithStream(kCFAllocatorSystemDefault, stream, 0, CFOptionFlags(CFIndex(opt.rawValue)), outFmt, outErr), to: NSObject.self)
+                return CFPropertyListCreateWithStream(kCFAllocatorSystemDefault, stream, 0, CFOptionFlags(CFIndex(opt.rawValue)), outFmt, outErr).takeRetainedValue()
             }
         }
         format?.pointee = PropertyListFormat(rawValue: UInt(fmt.rawValue))!

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ open class PropertyListSerialization : NSObject {`
`63`	`63`	`var error: Unmanaged<CFError>? = nil`
`64`	`64`	`let decoded = withUnsafeMutablePointer(to: &fmt) { (outFmt: UnsafeMutablePointer<CFPropertyListFormat>) -> NSObject? in`
`65`	`65`	`withUnsafeMutablePointer(to: &error) { (outErr: UnsafeMutablePointer<Unmanaged<CFError>?>) -> NSObject? in`
`66`		`- return unsafeBitCast(CFPropertyListCreateWithData(kCFAllocatorSystemDefault, data._cfObject, CFOptionFlags(CFIndex(opt.rawValue)), outFmt, outErr), to: NSObject.self)`
	`66`	`+ return CFPropertyListCreateWithData(kCFAllocatorSystemDefault, data._cfObject, CFOptionFlags(CFIndex(opt.rawValue)), outFmt, outErr).takeRetainedValue()`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`	`format?.pointee = PropertyListFormat(rawValue: UInt(fmt.rawValue))!`
`@@ -79,7 +79,7 @@ open class PropertyListSerialization : NSObject {`
`79`	`79`	`var error: Unmanaged<CFError>? = nil`
`80`	`80`	`let decoded = withUnsafeMutablePointer(to: &fmt) { (outFmt: UnsafeMutablePointer<CFPropertyListFormat>) -> NSObject? in`
`81`	`81`	`withUnsafeMutablePointer(to: &error) { (outErr: UnsafeMutablePointer<Unmanaged<CFError>?>) -> NSObject? in`
`82`		`- return unsafeBitCast(CFPropertyListCreateWithStream(kCFAllocatorSystemDefault, stream, 0, CFOptionFlags(CFIndex(opt.rawValue)), outFmt, outErr), to: NSObject.self)`
	`82`	`+ return CFPropertyListCreateWithStream(kCFAllocatorSystemDefault, stream, 0, CFOptionFlags(CFIndex(opt.rawValue)), outFmt, outErr).takeRetainedValue()`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`format?.pointee = PropertyListFormat(rawValue: UInt(fmt.rawValue))!`