From: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Date: Wed, 18 Dec 2013 13:58:00 +0000 (-0700)
Subject: glx: add missing null check in dri2_bind_tex_image
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c02f6c26d32bc7ce6214bc9653b2c083fbed7dc7;p=mesa.git

glx: add missing null check in dri2_bind_tex_image

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>

Reviewed-by: Brian Paul <brianp@vmware.com>
---

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;