Avoid invalid index slices in creating mirrors

phausler · phausler · commit f0d24bfe4e33 · 2017-09-15T08:21:03.000-07:00
diff --git a/stdlib/public/SDK/Foundation/Data.swift b/stdlib/public/SDK/Foundation/Data.swift
@@ -1862,7 +1862,7 @@ extension Data : CustomStringConvertible, CustomDebugStringConvertible, CustomRe
         
         // Minimal size data is output as an array
         if nBytes < 64 {
-            children.append((label: "bytes", value: Array(self[0..<nBytes])))
+            children.append((label: "bytes", value: Array(self[startIndex..<Swift.min(nBytes + startIndex, endIndex)])))
         }
         
         let m = Mirror(self, children:children, displayStyle: Mirror.DisplayStyle.struct)

Original file line number	Diff line number	Diff line change
`@@ -1862,7 +1862,7 @@ extension Data : CustomStringConvertible, CustomDebugStringConvertible, CustomRe`
`1862`	`1862`
`1863`	`1863`	`// Minimal size data is output as an array`
`1864`	`1864`	`if nBytes < 64 {`
`1865`		`- children.append((label: "bytes", value: Array(self[0..<nBytes])))`
	`1865`	`+ children.append((label: "bytes", value: Array(self[startIndex..<Swift.min(nBytes + startIndex, endIndex)])))`
`1866`	`1866`	`}`
`1867`	`1867`
`1868`	`1868`	`let m = Mirror(self, children:children, displayStyle: Mirror.DisplayStyle.struct)`