fix for NSData.bytes crash

Sergey Minakov · Sergey Minakov · commit 2c198bbad663 · 2016-11-09T11:06:27.000+03:00
diff --git a/Foundation/NSData.swift b/Foundation/NSData.swift
@@ -217,7 +217,11 @@ open class NSData : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
     }
     
     open var bytes: UnsafeRawPointer {
-        return UnsafeRawPointer(CFDataGetBytePtr(_cfObject))
+        guard let bytes = CFDataGetBytePtr(_cfObject) else {
+            //This could occure on empty data being encoded.
+            return UnsafeRawPointer([])
+        }
+        return UnsafeRawPointer(bytes)
     }
 
     
diff --git a/Foundation/NSURLRequest.swift b/Foundation/NSURLRequest.swift
@@ -216,8 +216,6 @@ open class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopying
             preconditionFailure("Unkeyed coding is unsupported.")
         }
         
-        self._body = .data(Data())
-        
         aCoder.encode(self.url?._bridgeToObjectiveC(), forKey: "NS.url")
         aCoder.encode(self._allHTTPHeaderFields?._bridgeToObjectiveC(), forKey: "NS._allHTTPHeaderFields")
         aCoder.encode(self.mainDocumentURL?._bridgeToObjectiveC(), forKey: "NS.mainDocumentURL")

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,11 @@ open class NSData : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`open var bytes: UnsafeRawPointer {`
`220`		`- return UnsafeRawPointer(CFDataGetBytePtr(_cfObject))`
	`220`	`+ guard let bytes = CFDataGetBytePtr(_cfObject) else {`
	`221`	`+ //This could occure on empty data being encoded.`
	`222`	`+ return UnsafeRawPointer([])`
	`223`	`+ }`
	`224`	`+ return UnsafeRawPointer(bytes)`
`221`	`225`	`}`
`222`	`226`
`223`	`227`
Original file line number	Diff line number	Diff line change
`@@ -216,8 +216,6 @@ open class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopying`
`216`	`216`	`preconditionFailure("Unkeyed coding is unsupported.")`
`217`	`217`	`}`
`218`	`218`
`219`		`- self._body = .data(Data())`
`220`		`-`
`221`	`219`	`aCoder.encode(self.url?._bridgeToObjectiveC(), forKey: "NS.url")`
`222`	`220`	`aCoder.encode(self._allHTTPHeaderFields?._bridgeToObjectiveC(), forKey: "NS._allHTTPHeaderFields")`
`223`	`221`	`aCoder.encode(self.mainDocumentURL?._bridgeToObjectiveC(), forKey: "NS.mainDocumentURL")`