Fix crash when joystick name unavailable on OS X

Fixes issue glfw#694
aaronmjacobs · Feb 8, 2016 · 87293db · 87293db
1 parent f51cf81
commit 87293db
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/cocoa_joystick.m b/src/cocoa_joystick.m
@@ -29,6 +29,7 @@
 
 #include <unistd.h>
 #include <ctype.h>
+#include <string.h>
 
 #include <mach/mach.h>
 #include <mach/mach_error.h>
@@ -287,11 +288,17 @@ static void matchCallback(void* context,
 
     CFStringRef name = IOHIDDeviceGetProperty(deviceRef,
                                               CFSTR(kIOHIDProductKey));
-    CFStringGetCString(name,
-                       joystick->name,
-                       sizeof(joystick->name),
-                       kCFStringEncodingUTF8);
-
+    if (name)
+    {
+        CFStringGetCString(name,
+                           joystick->name,
+                           sizeof(joystick->name),
+                           kCFStringEncodingUTF8);
+    }
+    else
+    {
+        strncpy(joystick->name, "Unknown", sizeof(joystick->name));
+    }
     joystick->axisElements = CFArrayCreateMutable(NULL, 0, NULL);
     joystick->buttonElements = CFArrayCreateMutable(NULL, 0, NULL);
     joystick->hatElements = CFArrayCreateMutable(NULL, 0, NULL);