summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Figa <[email protected]>2017-07-05 23:56:51 +0900
committerEmil Velikov <[email protected]>2017-07-05 18:49:22 +0100
commit0ede0f9dff519fe4444da91031c687207b0d9c5f (patch)
treeb019a7db57f3b01e503c205039430e368be7842a
parent50a8a7377ae071d5b4b927e9055a7ec8391acc59 (diff)
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 <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
-rw-r--r--src/egl/drivers/dri2/platform_android.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
index 3be69d87ffa..13006fee873 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);