egl/android: Check return value of dri2_get_dri_config()
authorTomasz Figa <tfiga@chromium.org>
Fri, 15 Jul 2016 07:53:48 +0000 (16:53 +0900)
committerEmil Velikov <emil.l.velikov@gmail.com>
Wed, 20 Jul 2016 14:47:23 +0000 (15:47 +0100)
It might return NULL if specific config variant is unsupported.

Cc: "11.2 12.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
src/egl/drivers/dri2/platform_android.c

index b33f4e8c8b04bdc8503bd0cdddb79d9b8d7be2a2..302eb8509c26cadfcc62d09336eb9328745dc78f 100644 (file)
@@ -280,6 +280,8 @@ droid_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type,
 
    config = dri2_get_dri_config(dri2_conf, EGL_WINDOW_BIT,
                                 dri2_surf->base.GLColorspace);
+   if (!config)
+      goto cleanup_surface;
 
    dri2_surf->dri_drawable =
       (*dri2_dpy->dri2->createNewDrawable)(dri2_dpy->dri_screen, config,