OSDN Git Service

egl/android: Set dpy->DriverData to NULL on error
authorNicolas Boichat <drinkcat@chromium.org>
Thu, 4 Aug 2016 02:07:54 +0000 (10:07 +0800)
committerEmil Velikov <emil.l.velikov@gmail.com>
Thu, 1 Sep 2016 09:05:40 +0000 (10:05 +0100)
Avoid use-after-free on error.

Fixes: 9ee683f877 (egl/dri2: Add reference count for dri2_egl_display)
Cc: "12.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Tested-by: Martin Peres <martin.peres@linux.intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit c0580f6a3859ec373ed11b3a6266c9b94d01a343)

src/egl/drivers/dri2/platform_android.c

index af94d39..31833c9 100644 (file)
@@ -882,6 +882,7 @@ cleanup_device:
    close(dri2_dpy->fd);
 cleanup_display:
    free(dri2_dpy);
+   dpy->DriverData = NULL;
 
    return _eglError(EGL_NOT_INITIALIZED, err);
 }