Mesa (master): glx: Add missing null check in DRI2WireToEvent

Brian Paul brianp at kemper.freedesktop.org
Thu Dec 12 01:19:35 UTC 2013


Module: Mesa
Branch: master
Commit: 84b1716b5efa98c21db32ff7f55bb7608d6a11df
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=84b1716b5efa98c21db32ff7f55bb7608d6a11df

Author: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Date:   Wed Dec 11 02:06:00 2013 -0700

glx: Add missing null check in DRI2WireToEvent

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/glx/dri2.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/glx/dri2.c b/src/glx/dri2.c
index bcd1f9c..7e8fdea 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);




More information about the mesa-commit mailing list