darlinghq/darling-cocotron
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-cocotron.git synced 2024-11-23 12:09:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #21 from TheBrokenRail/fix-nsdocumentcontroller

Browse Source 
Fix Occasional Segfaults And Add Fallback Error Message To NSDocumentController
This commit is contained in:
Andrew Hyatt 2021-06-05 17:29:09 -04:00 committed by GitHub
commit 3e3683f47b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
AppKit/NSDocumentController.m
View File

@ -28,6 +28,21 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#import <AppKit/NSWindowController.h>
#import <objc/runtime.h>
@interface _NSUnsupportedDocument : NSObject
- initWithType: (NSString *) type error: (NSError **) error;
@end
@implementation _NSUnsupportedDocument
- initWithType: (NSString *) type error: (NSError **) error {
*error = [NSError errorWithDomain:NSCocoaErrorDomain code: NSFeatureUnsupportedError userInfo: nil];
return nil;
}
@end
@interface NSDocument (private)
- (void) _setUntitledNumber: (int) number;
@end
@ -126,7 +141,7 @@ static NSDocumentController *shared = nil;
NSDictionary *info = [self _infoForType: type];
NSString *result = [info objectForKey: @"NSDocumentClass"];
return (result == nil) ? Nil : NSClassFromString(result);
return (result == nil) ? [_NSUnsupportedDocument class] : NSClassFromString(result);
}
- (NSArray *) fileExtensionsFromType: (NSString *) type {
@ -272,7 +287,7 @@ static NSDocumentController *shared = nil;
ofType: (NSString *) type
error: (NSError **) error
{
id result;
id result = nil;
Class class = [self documentClassForType: type];
result = [[[class alloc] initForURL: url
@ -285,10 +300,10 @@ static NSDocumentController *shared = nil;
- (id) makeUntitledDocumentOfType: (NSString *) type {
static int nextUntitledNumber = 1;
id result;
id result = nil;
Class class = [self documentClassForType: type];
NSError *error;
NSError *error = nil;
result = [[[class alloc] initWithType: type error: &error] autorelease];
if (result)
[result _setUntitledNumber: nextUntitledNumber++];
@ -316,10 +331,10 @@ static NSDocumentController *shared = nil;
}
static int nextUntitledNumber = 1;
id result;
id result = nil;
Class class = [self documentClassForType: type];
NSError *error;
NSError *error = nil;
result = [[[class alloc] initWithType: type error: &error] autorelease];
if (result)
[result _setUntitledNumber: nextUntitledNumber++];