Module: Mesa Branch: master Commit: bd9ae724591d23d029ee9f8a2f200b60bf6fba2c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bd9ae724591d23d029ee9f8a2f200b60bf6fba2c
Author: Leo Liu <[email protected]> Date: Thu May 12 10:05:57 2016 -0400 vl/dri: fix close fd error out fd should be set to -1 only if it got closed by pipe_loader_release. Signed-off-by: Leo Liu <[email protected]> --- src/gallium/auxiliary/vl/vl_winsys_dri.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri.c b/src/gallium/auxiliary/vl/vl_winsys_dri.c index 0136526..9ecc216 100644 --- a/src/gallium/auxiliary/vl/vl_winsys_dri.c +++ b/src/gallium/auxiliary/vl/vl_winsys_dri.c @@ -427,13 +427,15 @@ vl_dri2_screen_create(Display *display, int screen) return &scrn->base; release_pipe: - if (scrn->base.dev) + if (scrn->base.dev) { pipe_loader_release(&scrn->base.dev, 1); - fd = -1; + fd = -1; + } free_authenticate: free(authenticate); close_fd: - close(fd); + if (fd != -1) + close(fd); free_connect: free(connect); free_query: _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
