From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu, 18 Jun 2015 19:19:32 +0000 (+0100)
Subject: egl/wayland: handle NULL native_window in create_surface
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0afa6335079093627b47ff08da38bed00972c217;p=mesa.git

egl/wayland: handle NULL native_window in create_surface

Raise EGL_BAD_NATIVE_WINDOW instead of crashing.

v2: s/Rise/Raise/ (spotted by Michel)

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index 160fa8ce8d7..6f42d90ed96 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -149,6 +149,11 @@ dri2_wl_create_surface(_EGLDriver *drv, _EGLDisplay *disp,
    else
       dri2_surf->format = WL_DRM_FORMAT_ARGB8888;
 
+   if (!window) {
+      _eglError(EGL_BAD_NATIVE_WINDOW, "dri2_create_surface");
+      goto cleanup_surf;
+   }
+
    dri2_surf->wl_win = window;
 
    dri2_surf->wl_win->private = dri2_surf;