From c02f6c26d32bc7ce6214bc9653b2c083fbed7dc7 Mon Sep 17 00:00:00 2001 From: Juha-Pekka Heikkila Date: Wed, 18 Dec 2013 06:58:00 -0700 Subject: [PATCH] glx: add missing null check in dri2_bind_tex_image Signed-off-by: Juha-Pekka Heikkila Reviewed-by: Brian Paul --- src/glx/dri2_glx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index 309c1e7d733..ae807eede04 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; -- 2.30.2