From: Henri Verbeet <hverbeet@gmail.com>
Date: Mon, 31 Jan 2011 17:09:19 +0000 (+0100)
Subject: glx: Properly check for a valid fd in dri2CreateScreen().
X-Git-Tag: mesa-7.11-rc1~2382
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d9e0ea7393c14cbf2d58364726951b14e0d4fc7;p=platform%2Fupstream%2Fmesa.git

glx: Properly check for a valid fd in dri2CreateScreen().

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

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);