Module: Mesa Branch: master Commit: 7d9e0ea7393c14cbf2d58364726951b14e0d4fc7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d9e0ea7393c14cbf2d58364726951b14e0d4fc7
Author: Henri Verbeet <[email protected]> Date: Mon Jan 31 18:09:19 2011 +0100 glx: Properly check for a valid fd in dri2CreateScreen(). Signed-off-by: Brian Paul <[email protected]> --- src/glx/dri2_glx.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index ab7915c..a275ba5 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -804,6 +804,8 @@ dri2CreateScreen(int screen, struct glx_display * priv) return NULL; memset(psc, 0, sizeof *psc); + psc->fd = -1; + if (!glx_screen_init(&psc->base, screen, priv)) { Xfree(psc); return NULL; @@ -921,7 +923,7 @@ dri2CreateScreen(int screen, struct glx_display * priv) return &psc->base; handle_error: - if (psc->fd) + if (psc->fd >= 0) close(psc->fd); if (psc->driver) dlclose(psc->driver); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
