Merge remote-tracking branch 'origin/master' into swift-4.0-branch

swift-ci · swift-ci · commit 3f8eb1abf280 · 2017-08-11T05:12:22.000-07:00
diff --git a/Foundation/FileHandle.swift b/Foundation/FileHandle.swift
@@ -103,13 +103,16 @@ open class FileHandle : NSObject, NSSecureCoding {
             dynamicBuffer = _CFReallocf(dynamicBuffer!, total)
         }
         
-        if (0 == total) {
+        if total == 0 {
             free(dynamicBuffer)
         }
-        
-        if total > 0 {
+        else if total > 0 {
             let bytePtr = dynamicBuffer!.bindMemory(to: UInt8.self, capacity: total)
-            return Data(bytesNoCopy: bytePtr, count: total, deallocator: .none)
+            return Data(bytesNoCopy: bytePtr, count: total, deallocator: .free)
+        }
+        else {
+            assertionFailure("The total number of read bytes must not be negative")
+            free(dynamicBuffer)
         }
         
         return Data()

Original file line number	Diff line number	Diff line change
`@@ -103,13 +103,16 @@ open class FileHandle : NSObject, NSSecureCoding {`
`103`	`103`	`dynamicBuffer = _CFReallocf(dynamicBuffer!, total)`
`104`	`104`	`}`
`105`	`105`
`106`		`- if (0 == total) {`
	`106`	`+ if total == 0 {`
`107`	`107`	`free(dynamicBuffer)`
`108`	`108`	`}`
`109`		`-`
`110`		`- if total > 0 {`
	`109`	`+ else if total > 0 {`
`111`	`110`	`let bytePtr = dynamicBuffer!.bindMemory(to: UInt8.self, capacity: total)`
`112`		`- return Data(bytesNoCopy: bytePtr, count: total, deallocator: .none)`
	`111`	`+ return Data(bytesNoCopy: bytePtr, count: total, deallocator: .free)`
	`112`	`+ }`
	`113`	`+ else {`
	`114`	`+ assertionFailure("The total number of read bytes must not be negative")`
	`115`	`+ free(dynamicBuffer)`
`113`	`116`	`}`
`114`	`117`
`115`	`118`	`return Data()`