From 5fdc42fb877644ae4c3343c9391f959bc7d71515 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 11 Feb 2013 11:57:34 -0700 Subject: [PATCH] dri_glx: fix use after free report the critical error would use driverName. Found by internal RH coverity scan. Note: This is a candidate for stable branches. Reviewed-by: Alex Deucher Signed-off-by: Dave Airlie (cherry picked from commit a0ec9185eb90568ab57170dc682de0ba0c9e5e62) Conflicts: src/glx/dri_glx.c --- src/glx/dri_glx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/glx/dri_glx.c b/src/glx/dri_glx.c index 9bfcb0c082a..510e94b7fa7 100644 --- a/src/glx/dri_glx.c +++ b/src/glx/dri_glx.c @@ -865,7 +865,6 @@ driCreateScreen(int screen, struct glx_display *priv) } psc->driver = driOpenDriver(driverName); - Xfree(driverName); if (psc->driver == NULL) goto cleanup; @@ -913,11 +912,15 @@ driCreateScreen(int screen, struct glx_display *priv) psp->setSwapInterval = driSetSwapInterval; psp->getSwapInterval = driGetSwapInterval; + free(driverName); + return &psc->base; cleanup: CriticalErrorMessageF("failed to load driver: %s\n", driverName); + free(driverName); + if (psc->driver) dlclose(psc->driver); glx_screen_cleanup(&psc->base);