Commit 84b919a2a794c1526cde5fb512ee525d9eae69df

Ryan C. Gordon 2014-03-20T11:22:57

Static analysis fix: dereference of a NULL pointer.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m
index a55ab49..9e6edbb 100644
--- a/src/video/cocoa/SDL_cocoawindow.m
+++ b/src/video/cocoa/SDL_cocoawindow.m
@@ -1464,9 +1464,7 @@ Cocoa_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed)
         CGDisplayMoveCursorToPoint(kCGDirectMainDisplay, cgpoint);
     }
 
-    if ( window->flags & SDL_WINDOW_FULLSCREEN ) {
-        SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
-
+    if ( data && (window->flags & SDL_WINDOW_FULLSCREEN) ) {
         if (SDL_ShouldAllowTopmost() && (window->flags & SDL_WINDOW_INPUT_FOCUS)) {
             /* OpenGL is rendering to the window, so make it visible! */
             [data->nswindow setLevel:CGShieldingWindowLevel()];