commit 755f913b0271b2ce54f5374e9b478a51d707ce29
author Aaron Jacobs <aaron@aaronmjacobs.com> Tue Sep 29 02:21:44 2015
committer Camilla Berglund <elmindreda@elmindreda.org> Mon Oct 12 19:09:07 2015
tree 7ad4ab5d88c2724380b6e1c05070dee3c4429c5a
parent fb6fbcf700e79cb643413b6b3cbde11f6a8a23ed

Fix invalid types, null pointer use, memory leak

Closes #612.

src/cocoa_window.m

diff --git a/src/cocoa_window.m b/src/cocoa_window.m
index 54d528a..b7486ad 100644
--- a/src/cocoa_window.m
+++ b/src/cocoa_window.m
@@ -739,6 +739,7 @@
     [[appMenu addItemWithTitle:@"Services"
                        action:NULL
                 keyEquivalent:@""] setSubmenu:servicesMenu];
+    [servicesMenu release];
     [appMenu addItem:[NSMenuItem separatorItem]];
     [appMenu addItemWithTitle:[NSString stringWithFormat:@"Hide %@", appName]
                        action:@selector(hide:)
@@ -757,6 +758,7 @@
 
     NSMenuItem* windowMenuItem =
         [bar addItemWithTitle:@"" action:NULL keyEquivalent:@""];
+    [bar release];
     NSMenu* windowMenu = [[NSMenu alloc] initWithTitle:@"Window"];
     [NSApp setWindowsMenu:windowMenu];
     [windowMenuItem setSubmenu:windowMenu];

src/iokit_joystick.m

diff --git a/src/iokit_joystick.m b/src/iokit_joystick.m
index ebce5c8..f21b2bf 100644
--- a/src/iokit_joystick.m
+++ b/src/iokit_joystick.m
@@ -352,7 +352,7 @@
     if (result)
     {
         CFNumberRef pageRef = CFNumberCreate(kCFAllocatorDefault,
-                                             kCFNumberIntType,
+                                             kCFNumberLongType,
                                              &usagePage);
         if (pageRef)
         {
@@ -362,7 +362,7 @@
             CFRelease(pageRef);
 
             CFNumberRef usageRef = CFNumberCreate(kCFAllocatorDefault,
-                                                  kCFNumberIntType,
+                                                  kCFNumberLongType,
                                                   &usage);
             if (usageRef)
             {
@@ -421,11 +421,11 @@
             CFArrayAppendValue(matchingCFArrayRef, matchingCFDictRef);
             CFRelease(matchingCFDictRef);
         }
-    }
 
-    IOHIDManagerSetDeviceMatchingMultiple(_glfw.iokit_js.managerRef,
-                                          matchingCFArrayRef);
-    CFRelease(matchingCFArrayRef);
+        IOHIDManagerSetDeviceMatchingMultiple(_glfw.iokit_js.managerRef,
+                                              matchingCFArrayRef);
+        CFRelease(matchingCFArrayRef);
+    }
 
     IOHIDManagerRegisterDeviceMatchingCallback(_glfw.iokit_js.managerRef,
                                                &matchCallback, NULL);