Merge pull request #15 from KaiCode2/master

parkera · parkera · commit 305b4bfe24c9 · 2015-12-03T22:03:26.000-08:00
Added bounds checking to NSArray subscript
diff --git a/Foundation/NSArray.swift b/Foundation/NSArray.swift
@@ -344,8 +344,11 @@ public class NSArray : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NS
     
     public subscript (idx: Int) -> AnyObject {
         get {
-            // TODO: Bounds checking
-            return objectAtIndex(idx)
+                guard idx < count && idx >= 0 else {
+                    fatalError("\(self): Index out of bounds")
+                }
+            
+                return objectAtIndex(idx)
         }
     }
     

Original file line number	Diff line number	Diff line change
`@@ -344,8 +344,11 @@ public class NSArray : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NS`
`344`	`344`
`345`	`345`	`public subscript (idx: Int) -> AnyObject {`
`346`	`346`	`get {`
`347`		`- // TODO: Bounds checking`
`348`		`- return objectAtIndex(idx)`
	`347`	`+ guard idx < count && idx >= 0 else {`
	`348`	`+ fatalError("\(self): Index out of bounds")`
	`349`	`+ }`
	`350`	`+`
	`351`	`+ return objectAtIndex(idx)`
`349`	`352`	`}`
`350`	`353`	`}`
`351`	`354`