Skip to content

Don't rely on NSCache to retain newly-created lines. #1179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 24, 2021
Merged

Don't rely on NSCache to retain newly-created lines. #1179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/MacVim/MMCoreTextView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,7 +1138,7 @@ - (CTLineRef)lineForCharacterString:(NSString *)string
if (!strCache){
strCache = characterLines[key] = [[[NSCache alloc] init] autorelease];
}
CTLineRef line = (CTLineRef)[strCache objectForKey:string];
CTLineRef line = (CTLineRef)[[strCache objectForKey:string] retain];
if (!line) {
NSAttributedString *attrString = [[NSAttributedString alloc]
initWithString:string
Expand All @@ -1150,9 +1150,8 @@ - (CTLineRef)lineForCharacterString:(NSString *)string
line = CTLineCreateWithAttributedString((CFAttributedStringRef)attrString);
[attrString release];
[strCache setObject:(id)line forKey:[[string copy] autorelease]];
CFRelease(line);
}
return line;
return (CTLineRef)[(id)line autorelease];
}

@end // MMCoreTextView (Private)
Expand Down