[Mesa-dev] [PATCH] egl: android: Fix potential use of unitialized variable

Tomasz Figa tfiga at chromium.org
Wed Jul 5 14:56:51 UTC 2017


If dri2_setup_extensions() fails, the "err" variable would not be assigned
causing the error path to access an unitialized variable. Fix it by
assigning an error message.

Signed-off-by: Tomasz Figa <tfiga at chromium.org>
---
 src/egl/drivers/dri2/platform_android.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
index 3be69d87ff..13006fee87 100644
--- a/src/egl/drivers/dri2/platform_android.c
+++ b/src/egl/drivers/dri2/platform_android.c
@@ -1214,8 +1214,10 @@ dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *dpy)
       goto cleanup;
    }
 
-   if (!dri2_setup_extensions(dpy))
+   if (!dri2_setup_extensions(dpy)) {
+      err = "DRI2: failed to setup extensions";
       goto cleanup;
+   }
 
    dri2_setup_screen(dpy);
 
-- 
2.13.2.725.g09c95d1e9-goog



More information about the mesa-dev mailing list