kmx git

Commit faebe94c56857dc4febb898a2df996f3979eba02

2013-11-08T14:05:08

Mac: Fix a crash with SDL_MAC_NO_SANDBOX. When we get a kCGEventTapDisabledByTimeout or kCGEventTapDisabledByUserInput, the event tap would perform an invalid memory access. void pointers are so fun. This code only runs if you explicitly build with SDL_MAC_NO_SANDBOX.

diff --git a/src/video/cocoa/SDL_cocoamousetap.m b/src/video/cocoa/SDL_cocoamousetap.m
index 5879d49..fd79296 100644
--- a/src/video/cocoa/SDL_cocoamousetap.m
+++ b/src/video/cocoa/SDL_cocoamousetap.m
@@ -60,7 +60,7 @@ static const CGEventMask allGrabbedEventsMask =
 static CGEventRef
 Cocoa_MouseTapCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon)
 {
-    SDL_MouseData *driverdata = (SDL_MouseData*)refcon;
+    SDL_MouseEventTapData *tapdata = (SDL_MouseEventTapData*)refcon;
     SDL_Mouse *mouse = SDL_GetMouse();
     SDL_Window *window = SDL_GetKeyboardFocus();
     NSRect windowRect;
@@ -71,7 +71,7 @@ Cocoa_MouseTapCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event
         case kCGEventTapDisabledByTimeout:
         case kCGEventTapDisabledByUserInput:
             {
-                CGEventTapEnable(((SDL_MouseEventTapData*)(driverdata->tapdata))->tap, true);
+                CGEventTapEnable(tapdata->tap, true);
                 return NULL;
             }
         default:

kc3-lang/SDL

Commit faebe94c56857dc4febb898a2df996f3979eba02