Retaining _original_nextKeyView to prevent crash

williameveretteggplant · williameveretteggplant · commit 64e52ddbf9b1 · 2024-05-03T13:53:25.000-06:00
diff --git a/Source/NSTabView.m b/Source/NSTabView.m
@@ -78,6 +78,7 @@ - (id) initWithFrame: (NSRect)rect
       ASSIGN(_items, [NSMutableArray array]);
       ASSIGN(_font, [NSFont systemFontOfSize: 0]);
       _selected = nil;
+      _original_nextKeyView = nil;
       //_truncated_label = NO;
     }
 
@@ -738,7 +739,8 @@ - (void) _setUpKeyViewLoopWithNextKeyView: (NSView *)nextKeyView
 
 - (void) setNextKeyView: (NSView *)nextKeyView
 {
-  _original_nextKeyView = nextKeyView;
+  [_original_nextKeyView autorelease];
+  _original_nextKeyView = [nextKeyView retain];
   if (_selected)
     {
       [[_selected _lastKeyView] setNextKeyView: nextKeyView];

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ - (id) initWithFrame: (NSRect)rect`
`78`	`78`	`ASSIGN(_items, [NSMutableArray array]);`
`79`	`79`	`ASSIGN(_font, [NSFont systemFontOfSize: 0]);`
`80`	`80`	`_selected = nil;`
	`81`	`+ _original_nextKeyView = nil;`
`81`	`82`	`//_truncated_label = NO;`
`82`	`83`	`}`
`83`	`84`
`@@ -738,7 +739,8 @@ - (void) _setUpKeyViewLoopWithNextKeyView: (NSView *)nextKeyView`
`738`	`739`
`739`	`740`	`- (void) setNextKeyView: (NSView *)nextKeyView`
`740`	`741`	`{`
`741`		`- _original_nextKeyView = nextKeyView;`
	`742`	`+ [_original_nextKeyView autorelease];`
	`743`	`+ _original_nextKeyView = [nextKeyView retain];`
`742`	`744`	`if (_selected)`
`743`	`745`	`{`
`744`	`746`	`[[_selected _lastKeyView] setNextKeyView: nextKeyView];`