[FIX] made signedness aware, more checks on NSNotFound where necessary. fixing crash.

Author: Michael Ehrmann

Source/PSMTabBarControl.h

@@ -42,17 +42,17 @@
 @class PSMTabBarController;
 @protocol PSMTabStyle;
 
-typedef enum PSMTabBarOrientation : NSUInteger {
+typedef enum PSMTabBarOrientation : NSInteger {
 	PSMTabBarHorizontalOrientation,
 	PSMTabBarVerticalOrientation
 } PSMTabBarOrientation;
 
-typedef enum PSMTabBarTearOffStyle : NSUInteger {
+typedef enum PSMTabBarTearOffStyle : NSInteger {
 	PSMTabBarTearOffAlphaWindow,
 	PSMTabBarTearOffMiniwindow
 } PSMTabBarTearOffStyle;
 
-typedef enum PSMTabStateMask : NSUInteger {
+typedef enum PSMTabStateMask : NSInteger {
 	PSMTab_SelectedMask				= 1 << 1,
 	PSMTab_LeftIsSelectedMask		= 1 << 2,
 	PSMTab_RightIsSelectedMask		= 1 << 3,
@@ -222,7 +222,7 @@ typedef enum PSMTabStateMask : NSUInteger {
 #pragma mark Tab Information
 
 - (NSMutableArray *)representedTabViewItems;
-- (NSInteger)numberOfVisibleTabs;
+- (NSUInteger)numberOfVisibleTabs;
 - (PSMTabBarCell *)lastVisibleTab;
 
 #pragma mark Special Effects

Source/PSMTabBarControl.m

@@ -1301,9 +1301,9 @@ - (void)update:(BOOL)animate {
 		[[NSRunLoop currentRunLoop] addTimer:_animationTimer forMode:NSEventTrackingRunLoopMode];
 		[self _animateCells:_animationTimer];
 	} else {
-		for(NSInteger i = 0; i < [_cells count]; i++) {
+		for(NSUInteger i = 0; i < [_cells count]; i++) {
 			currentCell = [_cells objectAtIndex:i];
-			[currentCell setFrame:[_controller cellFrameAtIndex:i]];
+			[currentCell setFrame:[_controller cellFrameAtIndex:(NSInteger)i]];
 		}
 
 		[_addTabButton setFrame:[self addTabButtonRect]];
@@ -1317,11 +1317,11 @@ - (void)_animateCells:(NSTimer *)timer {
 	NSAnimation *animation = [[timer userInfo] objectAtIndex:1];
 	NSArray *targetFrames = [[timer userInfo] objectAtIndex:0];
 	PSMTabBarCell *currentCell;
-	NSInteger cellCount = [_cells count];
+	NSUInteger cellCount = [_cells count];
 
 	if((cellCount > 0) && [animation isAnimating]) {
 		//compare our target position with the current position and move towards the target
-		for(NSInteger i = 0; i < [targetFrames count] && i < cellCount; i++) {
+		for(NSUInteger i = 0; i < [targetFrames count] && i < cellCount; i++) {
 			currentCell = [_cells objectAtIndex:i];
 			NSRect cellFrame = [currentCell frame], targetFrame = [[targetFrames objectAtIndex:i] rectValue];
 			CGFloat sizeChange;
@@ -1358,7 +1358,7 @@ - (void)_animateCells:(NSTimer *)timer {
 	} else {
 		//put all the cells where they should be in their final position
 		if(cellCount > 0) {
-			for(NSInteger i = 0; i < [targetFrames count] && i < cellCount; i++) {
+			for(NSUInteger i = 0; i < [targetFrames count] && i < cellCount; i++) {
 				PSMTabBarCell *currentCell = [_cells objectAtIndex:i];
 				NSRect cellFrame = [currentCell frame], targetFrame = [[targetFrames objectAtIndex:i] rectValue];
 
@@ -1441,7 +1441,7 @@ - (void)updateTrackingAreas {
     // recreate tracking areas and tool tip rects
     NSPoint mouseLocation = [self convertPoint:[[self window] convertScreenToBase:[NSEvent mouseLocation]] fromView:nil];
 
-    NSUInteger cellIndex = 0;
+    NSInteger cellIndex = 0;
     for (PSMTabBarCell *aCell in _cells) {
 
         if ([aCell isInOverflowMenu])
@@ -1978,7 +1978,7 @@ - (void)tabView:(NSTabView *)aTabView didSelectTabViewItem:(NSTabViewItem *)tabV
 	NSInteger tabIndex = [aTabView indexOfTabViewItem:tabViewItem];
 
 	if([_cells count] > 0 && tabIndex < [_cells count]) {
-		PSMTabBarCell *thisCell = [_cells objectAtIndex:tabIndex];
+		PSMTabBarCell *thisCell = [_cells objectAtIndex:(NSUInteger)tabIndex];
 		if(_alwaysShowActiveTab && [thisCell isInOverflowMenu]) {
 			//temporarily disable the delegate in order to move the tab to a different index
 			id tempDelegate = [aTabView delegate];
@@ -1989,7 +1989,7 @@ - (void)tabView:(NSTabView *)aTabView didSelectTabViewItem:(NSTabViewItem *)tabV
 			[thisCell retain];
 			[aTabView removeTabViewItem:tabViewItem];
 			[aTabView insertTabViewItem:tabViewItem atIndex:0];
-            [self removeCellAtIndex:tabIndex];
+            [self removeCellAtIndex:(NSUInteger)tabIndex];
             [self insertCell:thisCell atIndex:0];
 			[thisCell setIsInOverflowMenu:NO];                  //very important else we get a fun recursive loop going
 			[[_cells objectAtIndex:[_cells count] - 1] setIsInOverflowMenu:YES];             //these 2 lines are pretty uncool and this logic needs to be updated
@@ -2245,7 +2245,7 @@ - (id)cellForPoint:(NSPoint)point cellFrame:(NSRectPointer)outFrame {
 		return nil;
 	}
 
-	NSInteger i, cnt = [_cells count];
+	NSUInteger i, cnt = [_cells count];
 	for(i = 0; i < cnt; i++) {
 		PSMTabBarCell *cell = [_cells objectAtIndex:i];
 
@@ -2260,7 +2260,7 @@ - (id)cellForPoint:(NSPoint)point cellFrame:(NSRectPointer)outFrame {
 }
 
 - (PSMTabBarCell *)lastVisibleTab {
-	NSInteger i, cellCount = [_cells count];
+	NSUInteger i, cellCount = [_cells count];
 	for(i = 0; i < cellCount; i++) {
 		if([[_cells objectAtIndex:i] isInOverflowMenu]) {
             if (i == 0)
@@ -2275,8 +2275,8 @@ - (PSMTabBarCell *)lastVisibleTab {
         return nil;
 }
 
-- (NSInteger)numberOfVisibleTabs {
-	NSInteger i, cellCount = 0;
+- (NSUInteger)numberOfVisibleTabs {
+	NSUInteger i, cellCount = 0;
 	PSMTabBarCell *nextCell;
 
 	for(i = 0; i < [_cells count]; i++) {

Source/PSMTabBarController.m

@@ -66,7 +66,7 @@ - (NSRect)cellFrameAtIndex:(NSInteger)index {
 	NSRect rect;
 
 	if(index > -1 && index < [_cellFrames count]) {
-		rect = [[_cellFrames objectAtIndex:index] rectValue];
+		rect = [[_cellFrames objectAtIndex:(NSUInteger)index] rectValue];
 	} else {
 		NSLog(@"cellFrameAtIndex: Invalid index (%ld)", (long)index);
 		rect = NSZeroRect;
@@ -106,16 +106,17 @@ - (void)setSelectedCell:(PSMTabBarCell *)cell {
 	[cell setTabState:PSMTab_SelectedMask];
 
 	if(![cell isInOverflowMenu]) {
-		NSInteger cellIndex = [cells indexOfObject:cell];
-
-		if(cellIndex > 0) {
-			nextCell = [cells objectAtIndex:cellIndex - 1];
-			[nextCell setTabState:[nextCell tabState] | PSMTab_RightIsSelectedMask];
-		}
+		NSUInteger cellIndex = [cells indexOfObject:cell];
+		if (cellIndex != NSNotFound) {
+			if(cellIndex > 0) {
+				nextCell = [cells objectAtIndex:cellIndex - 1];
+				[nextCell setTabState:[nextCell tabState] | PSMTab_RightIsSelectedMask];
+			}
 
-		if(cellIndex < [cells count] - 1) {
-			nextCell = [cells objectAtIndex:cellIndex + 1];
-			[nextCell setTabState:[nextCell tabState] | PSMTab_LeftIsSelectedMask];
+			if(cellIndex < [cells count] - 1) {
+				nextCell = [cells objectAtIndex:cellIndex + 1];
+				[nextCell setTabState:[nextCell tabState] | PSMTab_LeftIsSelectedMask];
+			}
 		}
 	}
 }
@@ -129,7 +130,7 @@ - (void)setSelectedCell:(PSMTabBarCell *)cell {
 
 - (void)layoutCells {
 	NSArray *cells = [_control cells];
-	NSInteger cellCount = [cells count];
+	NSUInteger cellCount = [cells count];
 
 	// make sure all of our tabs are accounted for before updating
 	if([[_control tabView] numberOfTabViewItems] != cellCount) {
@@ -152,20 +153,21 @@ - (void)layoutCells {
  */
 - (NSInteger)_shrinkWidths:(NSMutableArray *)newWidths towardMinimum:(NSInteger)minimum withAvailableWidth:(CGFloat)availableWidth {
 	BOOL changed = NO;
-	NSInteger count = [newWidths count];
+	NSUInteger count = [newWidths count];
 	NSInteger totalWidths = [[newWidths valueForKeyPath:@"@sum.intValue"] integerValue];
 	NSInteger originalTotalWidths = totalWidths;
 
 	do {
 		changed = NO;
 
-		for(NSInteger q = (count - 1); q >= 0; q--) {
-			CGFloat cellWidth = [[newWidths objectAtIndex:q] doubleValue];
+		for(NSUInteger q = count; q > 0; q--) {
+			NSUInteger index = q - 1;
+			CGFloat cellWidth = [[newWidths objectAtIndex:index] doubleValue];
 			if(cellWidth - 1 >= minimum) {
 				cellWidth--;
 				totalWidths--;
 
-				[newWidths replaceObjectAtIndex:q
+				[newWidths replaceObjectAtIndex:index
 				 withObject:[NSNumber numberWithDouble:cellWidth]];
 
 				changed = YES;
@@ -188,9 +190,9 @@ - (NSInteger)_shrinkWidths:(NSMutableArray *)newWidths towardMinimum:(NSInteger)
  */
 static NSInteger potentialMinimumForArray(NSArray *array, NSInteger minimum){
 	NSInteger runningTotal = 0;
-	NSInteger count = [array count];
+	NSUInteger count = [array count];
 
-	for(NSInteger i = 0; i < count; i++) {
+	for(NSUInteger i = 0; i < count; i++) {
 		NSInteger currentValue = [[array objectAtIndex:i] integerValue];
 		runningTotal += MIN(currentValue, minimum);
 	}
@@ -208,7 +210,7 @@ static NSInteger potentialMinimumForArray(NSArray *array, NSInteger minimum){
  */
 
 - (NSArray *)_generateWidthsFromCells:(NSArray *)cells {
-	NSInteger cellCount = [cells count], i, numberOfVisibleCells = ([_control orientation] == PSMTabBarHorizontalOrientation) ? 1 : 0;
+	NSUInteger cellCount = [cells count], i, numberOfVisibleCells = ([_control orientation] == PSMTabBarHorizontalOrientation) ? 1 : 0;
 	NSMutableArray *newWidths = [NSMutableArray arrayWithCapacity:cellCount];
 	id <PSMTabStyle> style = [_control style];
 	CGFloat availableWidth = [_control availableCellWidth], currentOrigin = 0, totalOccupiedWidth = 0.0, width;
@@ -248,12 +250,12 @@ - (NSArray *)_generateWidthsFromCells:(NSArray *)cells {
 
 				//If we're not going to use the overflow menu, cram all the tab cells into the bar regardless of minimum width
 				if(![_control useOverflowMenu]) {
-					NSInteger j, averageWidth = (availableWidth / cellCount);
+					NSInteger averageWidth = (availableWidth / cellCount);
 
 					numberOfVisibleCells = cellCount;
 					[newWidths removeAllObjects];
 
-					for(j = 0; j < cellCount; j++) {
+					for(NSUInteger j = 0; j < cellCount; j++) {
 						CGFloat desiredWidth = [[cells objectAtIndex:j] desiredWidthOfCell];
 						[newWidths addObject:[NSNumber numberWithDouble:(desiredWidth < averageWidth && [_control sizeCellsToFit]) ? desiredWidth : averageWidth]];
 					}
@@ -323,11 +325,10 @@ - (NSArray *)_generateWidthsFromCells:(NSArray *)cells {
 							 */
 							NSInteger leftoverWidth = availableWidth - totalOccupiedWidth;
 							if(leftoverWidth > 0) {
-								NSInteger q;
-								for(q = numberOfVisibleCells - 1; q >= 0; q--) {
-									NSInteger desiredAddition = (NSInteger)leftoverWidth / (q + 1);
-									NSInteger newCellWidth = (NSInteger)[[newWidths objectAtIndex:q] doubleValue] + desiredAddition;
-									[newWidths replaceObjectAtIndex:q withObject:[NSNumber numberWithDouble:newCellWidth]];
+								for(NSUInteger q = numberOfVisibleCells; q > 0; q--) {
+									NSInteger desiredAddition = leftoverWidth / (NSInteger)q;
+									NSInteger newCellWidth = (NSInteger)[[newWidths objectAtIndex:q-1] doubleValue] + desiredAddition;
+									[newWidths replaceObjectAtIndex:q-1 withObject:[NSNumber numberWithDouble:newCellWidth]];
 									leftoverWidth -= desiredAddition;
 									totalOccupiedWidth += desiredAddition;
 								}
@@ -342,11 +343,10 @@ - (NSArray *)_generateWidthsFromCells:(NSArray *)cells {
 
 						// stretch - distribute leftover room among cells, since we can't add this cell
 						NSInteger leftoverWidth = availableWidth - totalOccupiedWidth;
-						NSInteger q;
-						for(q = i - 1; q >= 0; q--) {
-							NSInteger desiredAddition = (NSInteger)leftoverWidth / (q + 1);
-							NSInteger newCellWidth = (NSInteger)[[newWidths objectAtIndex:q] doubleValue] + desiredAddition;
-							[newWidths replaceObjectAtIndex:q withObject:[NSNumber numberWithDouble:newCellWidth]];
+						for(NSUInteger q = i; q > 0; q--) {
+							NSInteger desiredAddition = leftoverWidth / (NSInteger)q;
+							NSInteger newCellWidth = (NSInteger)[[newWidths objectAtIndex:q-1] doubleValue] + desiredAddition;
+							[newWidths replaceObjectAtIndex:q-1 withObject:[NSNumber numberWithDouble:newCellWidth]];
 							leftoverWidth -= desiredAddition;
 						}
 
@@ -468,15 +468,16 @@ - (NSArray *)_generateWidthsFromCells:(NSArray *)cells {
  */
 
 - (void)_setupCells:(NSArray *)cells withWidths:(NSArray *)widths {
-	NSInteger i, tabState, cellCount = [cells count];
+	NSInteger tabState;
+	NSUInteger cellCount = [cells count];
 	NSRect cellRect = [_control genericCellRect];
 	PSMTabBarCell *cell;
 	NSTabViewItem *selectedTabViewItem = [[_control tabView] selectedTabViewItem];
 	NSMenuItem *menuItem;
 
 	[_overflowMenu release], _overflowMenu = nil;
 
-	for(i = 0; i < cellCount; i++) {
+	for(NSUInteger i = 0; i < cellCount; i++) {
 		cell = [cells objectAtIndex:i];
 
 		if(i < [widths count]) {