Fixed bug 2956 - De-reference videodata without NULL check in X11_Dis…

…patchEvent(_THIS) function
libsdl-org · Oct 8, 2016 · 8b64a78da989e4efa45697a435b76828a820df0e · 8b64a78
1 parent 93ff12c
commit 8b64a78da989e4efa45697a435b76828a820df0e
Unified Split

Showing with 6 additions and 1 deletion.

+6 −1 src/video/x11/SDL_x11events.c
diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c
@@ -536,14 +536,19 @@ static void
 X11_DispatchEvent(_THIS)
 {
     SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
-    Display *display = videodata->display;
+    Display *display;
     SDL_WindowData *data;
     XEvent xevent;
     int orig_event_type;
     KeyCode orig_keycode;
     XClientMessageEvent m;
     int i;
 
+    if (!videodata) {
+        return;
+    }
+    display = videodata->display;
+
     SDL_zero(xevent);           /* valgrind fix. --ryan. */
     X11_XNextEvent(display, &xevent);