Merge pull request #17084 from cbrnr/fix-macosx-segfault

dopplershift · web-flow · commit cb34934c6f96 · 2020-05-05T00:13:05.000-06:00
Fix macosx segfault
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -138,7 +138,6 @@ static int wait_for_stdin(void)
         }
 
         NSEvent* event;
-        NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
         while (true) {
             while (true) {
                 event = [NSApp nextEventMatchingMask: NSAnyEventMask
@@ -151,7 +150,6 @@ static int wait_for_stdin(void)
             CFRunLoopRun();
             if (interrupted || CFReadStreamHasBytesAvailable(stream)) break;
         }
-        [pool release];
 
         if (py_sigint_handler) PyOS_setsig(SIGINT, py_sigint_handler);
         CFReadStreamUnscheduleFromRunLoop(stream,
@@ -279,15 +277,13 @@ static void lazy_init(void) {
     PyOS_InputHook = wait_for_stdin;
 #endif
 
-    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
     WindowServerConnectionManager* connectionManager = [WindowServerConnectionManager sharedManager];
     NSWorkspace* workspace = [NSWorkspace sharedWorkspace];
     NSNotificationCenter* notificationCenter = [workspace notificationCenter];
     [notificationCenter addObserver: connectionManager
                            selector: @selector(launch:)
                                name: NSWorkspaceDidLaunchApplicationNotification
                              object: nil];
-    [pool release];
 }
 
 static PyObject*
@@ -373,11 +369,7 @@ static CGFloat _get_device_scale(CGContextRef cr)
 
     if(view) /* The figure may have been closed already */
     {
-        /* Whereas drawRect creates its own autorelease pool, apparently
-         * [view display] also needs one. Create and release it here. */
-        NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
         [view display];
-        [pool release];
     }
 
     Py_RETURN_NONE;
@@ -513,7 +505,6 @@ static CGFloat _get_device_scale(CGContextRef cr)
             close(channel[0]);
     }
 
-    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
     NSDate* date =
         (timeout > 0.0) ? [NSDate dateWithTimeIntervalSinceNow: timeout]
                         : [NSDate distantFuture];
@@ -525,7 +516,6 @@ static CGFloat _get_device_scale(CGContextRef cr)
        if (!event || [event type]==NSApplicationDefined) break;
        [NSApp sendEvent: event];
     }
-    [pool release];
 
     if (py_sigint_handler) PyOS_setsig(SIGINT, py_sigint_handler);
 
@@ -698,7 +688,6 @@ static CGFloat _get_device_scale(CGContextRef cr)
     rect.size.height = height;
     rect.size.width = width;
 
-    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
     self->window = [self->window initWithContentRect: rect
                                          styleMask: NSTitledWindowMask
                                                   | NSClosableWindowMask
@@ -715,7 +704,6 @@ static CGFloat _get_device_scale(CGContextRef cr)
     [window makeFirstResponder: view];
     [[window contentView] addSubview: view];
 
-    [pool release];
     return 0;
 }
 
@@ -732,9 +720,7 @@ static CGFloat _get_device_scale(CGContextRef cr)
     Window* window = self->window;
     if(window)
     {
-        NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
         [window close];
-        [pool release];
     }
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
@@ -745,10 +731,8 @@ static CGFloat _get_device_scale(CGContextRef cr)
     Window* window = self->window;
     if(window)
     {
-        NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
         [window makeKeyAndOrderFront: nil];
         [window orderFrontRegardless];
-        [pool release];
     }
     Py_RETURN_NONE;
 }
@@ -759,9 +743,7 @@ static CGFloat _get_device_scale(CGContextRef cr)
     Window* window = self->window;
     if(window)
     {
-        NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
         [window close];
-        [pool release];
         self->window = NULL;
     }
     Py_RETURN_NONE;
@@ -778,12 +760,10 @@ static CGFloat _get_device_scale(CGContextRef cr)
     Window* window = self->window;
     if(window)
     {
-        NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
         NSString* ns_title = [[[NSString alloc]
                                initWithCString: title
                                encoding: NSUTF8StringEncoding] autorelease];
         [window setTitle: ns_title];
-        [pool release];
     }
     Py_RETURN_NONE;
 }
@@ -795,13 +775,11 @@ static CGFloat _get_device_scale(CGContextRef cr)
     PyObject* result = NULL;
     if(window)
     {
-        NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
         NSString* title = [window title];
         if (title) {
             const char* cTitle = [title UTF8String];
             result = PyUnicode_FromString(cTitle);
         }
-        [pool release];
     }
     if (result) {
         return result;
@@ -1127,9 +1105,9 @@ -(void)save_figure:(id)sender
     const float gap = 2;
     const int height = 36;
     const int imagesize = 24;
-    
+
     self->height = height;
-    
+
     const char* basedir;
 
     obj = PyObject_GetAttrString((PyObject*)self, "canvas");
@@ -1154,7 +1132,6 @@ -(void)save_figure:(id)sender
 
     if(!PyArg_ParseTuple(args, "s", &basedir)) return -1;
 
-    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
     NSRect bounds = [view bounds];
     NSWindow* window = [view window];
 
@@ -1257,8 +1234,6 @@ -(void)save_figure:(id)sender
     [messagebox release];
     [[window contentView] display];
 
-    [pool release];
-
     self->messagebox = messagebox;
     return 0;
 }
@@ -1289,24 +1264,22 @@ -(void)save_figure:(id)sender
     NSTextView* messagebox = self->messagebox;
 
     if (messagebox)
-    {   NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+    {
         NSString* text = [NSString stringWithUTF8String: message];
         [messagebox setString: text];
-        
+
         // Adjust width with the window size
         NSRect rectWindow = [messagebox.superview frame];
         NSRect rect = [messagebox frame];
         rect.size.width = rectWindow.size.width - rect.origin.x;
         [messagebox setFrame: rect];
-        
+
         // Adjust height with the content size
         [messagebox.layoutManager ensureLayoutForTextContainer: messagebox.textContainer];
         NSRect contentSize = [messagebox.layoutManager usedRectForTextContainer: messagebox.textContainer];
         rect = [messagebox frame];
         rect.origin.y = 0.5 * (self->height - contentSize.size.height);
         [messagebox setFrame: rect];
-        
-        [pool release];
     }
 
     Py_RETURN_NONE;
@@ -2323,14 +2296,12 @@ - (int)index
 show(PyObject* self)
 {
     [NSApp activateIgnoringOtherApps: YES];
-    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
     NSArray *windowsArray = [NSApp windows];
     NSEnumerator *enumerator = [windowsArray objectEnumerator];
     NSWindow *window;
     while ((window = [enumerator nextObject])) {
         [window orderFront:nil];
     }
-    [pool release];
     Py_BEGIN_ALLOW_THREADS
     [NSApp run];
     Py_END_ALLOW_THREADS
