Merge pull request #2994 from jkseppan/macosx-fixes

jkseppan · jkseppan · commit 8429b1e795b8 · 2014-04-22T07:39:34.000+03:00
Minor fixes in _macosx.m
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -203,6 +203,7 @@ static int wait_for_stdin(void)
         if (interrupted) raise(SIGINT);
     }
     CFReadStreamClose(stream);
+    CFRelease(stream);
     return 1;
 }
 
@@ -2103,6 +2104,7 @@ static int _find_maximum(CGFloat values[3])
                                                     function,
                                                     true,
                                                     true);
+        CGColorSpaceRelease(colorspace);
         CGFunctionRelease(function);
         if (shading)
         {
@@ -2236,6 +2238,7 @@ static CGRect _find_enclosing_rect(CGPoint points[3])
     CGImageRef mask = CGBitmapContextCreateImage(bitmap);
     CGContextClipToMask(cr, rect, mask);
     CGImageRelease(mask);
+    CGContextRelease(bitmap);
     free(data);
     return 0;
 }
@@ -3990,9 +3993,9 @@ static void _data_provider_release(void* info, const void* data, size_t size)
     if(window)
     {
         NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-        NSString* ns_title = [[NSString alloc]
-                              initWithCString: title
-                              encoding: NSUTF8StringEncoding];
+        NSString* ns_title = [[[NSString alloc]
+                               initWithCString: title
+                               encoding: NSUTF8StringEncoding] autorelease];
         [window setTitle: ns_title];
         [pool release];
     }
@@ -4489,7 +4492,12 @@ -(void)save_figure:(id)sender
     NSMenu* menu = [button menu];
     NSArray* items = [menu itemArray];
     unsigned int n = [items count];
-    int* states = malloc(n*sizeof(int));
+    int* states = calloc(n, sizeof(int));
+    if (!states)
+    {
+        PyErr_SetString(PyExc_RuntimeError, "calloc failed");
+        return NULL;
+    }
     int i;
     unsigned int m = 0;
     NSEnumerator* enumerator = [items objectEnumerator];
@@ -4504,7 +4512,6 @@ -(void)save_figure:(id)sender
             states[i] = 1;
             m++;
         }
-        else states[i] = 0;
     }
     int j = 0;
     PyObject* list = PyList_New(m);
