1 files changed, 2 insertions, 0 deletions
diff --git a/src/glx/dri2.c b/src/glx/dri2.c
index bcd1f9c9011..7e8fdeabf47 100644
--- a/src/glx/dri2.c
+++ b/src/glx/dri2.c
@@ -102,6 +102,8 @@ DRI2WireToEvent(Display *dpy, XEvent *event, xEvent *wire)
       __GLXDRIdrawable *pdraw;
 
       pdraw = dri2GetGlxDrawableFromXDrawableId(dpy, awire->drawable);
+      if (pdraw == NULL)
+         return False;
 
       /* Ignore swap events if we're not looking for them */
       aevent->type = dri2GetSwapEventType(dpy, awire->drawable);