Mesa (master): glx: Add missing null check in dri2CreateDrawable
Brian Paul
brianp at kemper.freedesktop.org
Wed Dec 18 16:17:40 UTC 2013
Module: Mesa
Branch: master
Commit: ca3df5eeda1def6aa7e44fd136e2c17d3a061e87
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca3df5eeda1def6aa7e44fd136e2c17d3a061e87
Author: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Date: Mon Dec 16 07:04:00 2013 -0700
glx: Add missing null check in dri2CreateDrawable
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/glx/dri2_glx.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index bfeebed..309c1e7 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 =
More information about the mesa-commit
mailing list