Module: Mesa
Branch: master
Commit: c02f6c26d32bc7ce6214bc9653b2c083fbed7dc7
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c02f6c26d32bc7ce6214bc9653b2c083fbed7dc7
Author: Juha-Pekka Heikkila <juhapekka.heikk...@gmail.com>
Date: Wed Dec 18 06:58:00 2013 -0700
glx: add missing null check in dri2_bind_tex_image
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikk...@gmail.com>
Reviewed-by: Brian Paul <bri...@vmware.com>
---
src/glx/dri2_glx.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 309c1e7..ae807ee 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -991,10 +991,14 @@ dri2_bind_tex_image(Display * dpy,
__GLXDRIdrawable *base = GetGLXDRIDrawable(dpy, drawable);
struct glx_display *dpyPriv = __glXInitialize(dpy);
struct dri2_drawable *pdraw = (struct dri2_drawable *) base;
- struct dri2_display *pdp =
- (struct dri2_display *) dpyPriv->dri2Display;
+ struct dri2_display *pdp;
struct dri2_screen *psc;
+ if (dpyPriv == NULL)
+ return;
+
+ pdp = (struct dri2_display *) dpyPriv->dri2Display;
+
if (pdraw != NULL) {
psc = (struct dri2_screen *) base->psc;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
