Prevents #67 - out of bounds color crashes.

stefanceriu · stefanceriu · commit 710728b77f39 · 2015-08-15T10:18:40.000+01:00
diff --git a/SCXcodeMinimap/SCXcodeMinimapView.m b/SCXcodeMinimap/SCXcodeMinimapView.m
@@ -420,7 +420,13 @@ - (NSDictionary *)layoutManager:(NSLayoutManager *)layoutManager
 		}
 	}
 	
-	NSColor *foregroundColor = [[((DVTFontAndColorTheme *)theme.dvtTheme) syntaxColorsByNodeType] pointerAtIndex:nodeType];
+	DVTPointerArray *colors = [((DVTFontAndColorTheme *)theme.dvtTheme) syntaxColorsByNodeType];
+	
+	NSColor *foregroundColor = nil;
+	if(nodeType < colors.count) {
+		foregroundColor = [colors pointerAtIndex:nodeType];
+	}
+	
 	if(foregroundColor == nil) {
 		foregroundColor = theme.sourcePlainTextColor;
 	}

Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,13 @@ - (NSDictionary )layoutManager:(NSLayoutManager )layoutManager`
`420`	`420`	`}`
`421`	`421`	`}`
`422`	`422`
`423`		`- NSColor foregroundColor = [[((DVTFontAndColorTheme )theme.dvtTheme) syntaxColorsByNodeType] pointerAtIndex:nodeType];`
	`423`	`+ DVTPointerArray colors = [((DVTFontAndColorTheme )theme.dvtTheme) syntaxColorsByNodeType];`
	`424`	`+`
	`425`	`+ NSColor *foregroundColor = nil;`
	`426`	`+ if(nodeType < colors.count) {`
	`427`	`+ foregroundColor = [colors pointerAtIndex:nodeType];`
	`428`	`+ }`
	`429`	`+`
`424`	`430`	`if(foregroundColor == nil) {`
`425`	`431`	`foregroundColor = theme.sourcePlainTextColor;`
`426`	`432`	`}`