From ca3df5eeda1def6aa7e44fd136e2c17d3a061e87 Mon Sep 17 00:00:00 2001 From: Juha-Pekka Heikkila Date: Mon, 16 Dec 2013 07:04:00 -0700 Subject: [PATCH] glx: Add missing null check in dri2CreateDrawable Signed-off-by: Juha-Pekka Heikkila Reviewed-by: Brian Paul --- src/glx/dri2_glx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index bfeebed9dd6..309c1e7d733 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -366,6 +366,10 @@ dri2CreateDrawable(struct glx_screen *base, XID xDrawable, struct dri2_display *pdp; GLint vblank_mode = DRI_CONF_VBLANK_DEF_INTERVAL_1; + dpyPriv = __glXInitialize(psc->base.dpy); + if (dpyPriv == NULL) + return NULL; + pdraw = calloc(1, sizeof(*pdraw)); if (!pdraw) return NULL; @@ -395,8 +399,6 @@ dri2CreateDrawable(struct glx_screen *base, XID xDrawable, } DRI2CreateDrawable(psc->base.dpy, xDrawable); - - dpyPriv = __glXInitialize(psc->base.dpy); pdp = (struct dri2_display *)dpyPriv->dri2Display;; /* Create a new drawable */ pdraw->driDrawable = -- 2.30.2