[Mesa-dev] [PATCH] egl: Fix crashes in eglCreate*Surface()

Tapani Pälli tapani.palli at intel.com
Wed Dec 14 11:12:54 UTC 2016


Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

On 12/14/2016 12:40 AM, Chad Versace wrote:
> Don't dereference a null EGLDisplay.
>
> Fixes tests
>    dEQP-EGL.functional.negative_api.create_pbuffer_surface
>    dEQP-EGL.functional.negative_api.create_pixmap_surface
>
> Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=99038
> ---
>   src/egl/main/eglapi.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
> index 33d562042f..a349992c46 100644
> --- a/src/egl/main/eglapi.c
> +++ b/src/egl/main/eglapi.c
> @@ -856,7 +856,7 @@ _eglCreateWindowSurfaceCommon(_EGLDisplay *disp, EGLConfig config,
>         RETURN_EGL_ERROR(disp, EGL_BAD_NATIVE_WINDOW, EGL_NO_SURFACE);
>   
>   #ifdef HAVE_SURFACELESS_PLATFORM
> -   if (disp->Platform == _EGL_PLATFORM_SURFACELESS) {
> +   if (disp && disp->Platform == _EGL_PLATFORM_SURFACELESS) {
>         /* From the EGL_MESA_platform_surfaceless spec (v1):
>          *
>          *    eglCreatePlatformWindowSurface fails when called with a <display>
> @@ -977,7 +977,7 @@ _eglCreatePixmapSurfaceCommon(_EGLDisplay *disp, EGLConfig config,
>      EGLSurface ret;
>   
>   #if HAVE_SURFACELESS_PLATFORM
> -   if (disp->Platform == _EGL_PLATFORM_SURFACELESS) {
> +   if (disp && disp->Platform == _EGL_PLATFORM_SURFACELESS) {
>         /* From the EGL_MESA_platform_surfaceless spec (v1):
>          *
>          *   [Like eglCreatePlatformWindowSurface,] eglCreatePlatformPixmapSurface




More information about the mesa-dev mailing list