From 0b47d59e5be0fb5eb0277f02646914f4a55d35d5 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Sat, 29 Jan 2011 15:00:50 -0800 Subject: [PATCH] glx: Fix leaks in DRISW screen creation error paths. Signed-off-by: Brian Paul --- src/glx/drisw_glx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c index 237ce176176..5c7f40cdffa 100644 --- a/src/glx/drisw_glx.c +++ b/src/glx/drisw_glx.c @@ -452,8 +452,10 @@ driCreateScreen(int screen, struct glx_display *priv) return NULL; memset(psc, 0, sizeof *psc); - if (!glx_screen_init(&psc->base, screen, priv)) - return NULL; + if (!glx_screen_init(&psc->base, screen, priv)) { + Xfree(psc); + return NULL; + } psc->driver = driOpenSwrast(); if (psc->driver == NULL) @@ -504,6 +506,7 @@ driCreateScreen(int screen, struct glx_display *priv) handle_error: if (psc->driver) dlclose(psc->driver); + glx_screen_cleanup(&psc->base); Xfree(psc); ErrorMessageF("reverting to indirect rendering\n"); -- 2.30.2