mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 21:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix invalid types, null pointer use, memory leak

Browse Source 
Closes #612.
This commit is contained in:
Aaron Jacobs 2015-09-28 19:21:44 -07:00 committed by Camilla Berglund
parent fb6fbcf700
commit 755f913b02
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cocoa_window.m
View File

@ -739,6 +739,7 @@ static void createMenuBar(void)
[[appMenu addItemWithTitle:@"Services" [[appMenu addItemWithTitle:@"Services"
action:NULL action:NULL
keyEquivalent:@""] setSubmenu:servicesMenu]; keyEquivalent:@""] setSubmenu:servicesMenu];
[servicesMenu release];
[appMenu addItem:[NSMenuItem separatorItem]]; [appMenu addItem:[NSMenuItem separatorItem]];
[appMenu addItemWithTitle:[NSString stringWithFormat:@"Hide %@", appName] [appMenu addItemWithTitle:[NSString stringWithFormat:@"Hide %@", appName]
action:@selector(hide:) action:@selector(hide:)
@ -757,6 +758,7 @@ static void createMenuBar(void)
NSMenuItem* windowMenuItem = NSMenuItem* windowMenuItem =
[bar addItemWithTitle:@"" action:NULL keyEquivalent:@""]; [bar addItemWithTitle:@"" action:NULL keyEquivalent:@""];
[bar release];
NSMenu* windowMenu = [[NSMenu alloc] initWithTitle:@"Window"]; NSMenu* windowMenu = [[NSMenu alloc] initWithTitle:@"Window"];
[NSApp setWindowsMenu:windowMenu]; [NSApp setWindowsMenu:windowMenu];
[windowMenuItem setSubmenu:windowMenu]; [windowMenuItem setSubmenu:windowMenu];

12
src/iokit_joystick.m
View File

@ -352,7 +352,7 @@ static CFMutableDictionaryRef createMatchingDictionary(long usagePage,
if (result) if (result)
{ {
CFNumberRef pageRef = CFNumberCreate(kCFAllocatorDefault, CFNumberRef pageRef = CFNumberCreate(kCFAllocatorDefault,
kCFNumberIntType, kCFNumberLongType,
&usagePage); &usagePage);
if (pageRef) if (pageRef)
{ {
@ -362,7 +362,7 @@ static CFMutableDictionaryRef createMatchingDictionary(long usagePage,
CFRelease(pageRef); CFRelease(pageRef);
CFNumberRef usageRef = CFNumberCreate(kCFAllocatorDefault, CFNumberRef usageRef = CFNumberCreate(kCFAllocatorDefault,
kCFNumberIntType, kCFNumberLongType,
&usage); &usage);
if (usageRef) if (usageRef)
{ {
@ -421,11 +421,11 @@ void _glfwInitJoysticks(void)
CFArrayAppendValue(matchingCFArrayRef, matchingCFDictRef); CFArrayAppendValue(matchingCFArrayRef, matchingCFDictRef);
CFRelease(matchingCFDictRef); CFRelease(matchingCFDictRef);
} }
}
IOHIDManagerSetDeviceMatchingMultiple(_glfw.iokit_js.managerRef, IOHIDManagerSetDeviceMatchingMultiple(_glfw.iokit_js.managerRef,
matchingCFArrayRef); matchingCFArrayRef);
CFRelease(matchingCFArrayRef); CFRelease(matchingCFArrayRef);
}
IOHIDManagerRegisterDeviceMatchingCallback(_glfw.iokit_js.managerRef, IOHIDManagerRegisterDeviceMatchingCallback(_glfw.iokit_js.managerRef,
&matchCallback, NULL); &matchCallback, NULL);