commit 1bd4656a5c5516b4759800ab0b8495c8ecf5350c
author Sam Lantinga <slouken@libsdl.org> Fri Oct 07 17:26:25 2016 -0700
committer Sam Lantinga <slouken@libsdl.org> Fri Oct 07 17:26:25 2016 -0700
tree d36b321dc9e2db0acee136455558b33d8ce9fcd1
parent 15c57330b9d07f62e23ab1b99efe38f4b9717453

Fixed bug 2956 - De-reference videodata without NULL check in X11_DispatchEvent(_THIS) function

src/video/x11/SDL_x11events.c

diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c
index e7dbd11..5d7f1df 100644
--- a/src/video/x11/SDL_x11events.c
+++ b/src/video/x11/SDL_x11events.c
@@ -536,7 +536,7 @@
 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;
@@ -544,6 +544,11 @@
     XClientMessageEvent m;
     int i;
 
+    if (!videodata) {
+        return;
+    }
+    display = videodata->display;
+
     SDL_zero(xevent);           /* valgrind fix. --ryan. */
     X11_XNextEvent(display, &xevent);