Mesa (master): egl: android: Fix potential use of unitialized variable

[Emil Velikov]

Module: Mesa
Branch: master
Commit: 0ede0f9dff519fe4444da91031c687207b0d9c5f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ede0f9dff519fe4444da91031c687207b0d9c5f

Author: Tomasz Figa <tfiga at chromium.org>
Date:   Wed Jul  5 23:56:51 2017 +0900

egl: android: Fix potential use of unitialized variable

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.

Fixes: 2c341f2bda4 ("egl: refactor dri2_create_screen() into three separate functions")
Signed-off-by: Tomasz Figa <tfiga at chromium.org>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

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