[Mesa-dev] [PATCH V2] Check if the window is non-NULL before setting swap interval.

Eric Engestrom eric.engestrom at intel.com
Thu Jul 5 09:53:46 UTC 2018


On Monday, 2018-07-02 14:12:44 +0530, samiuddi wrote:
> This fixes crash due to NULL window when swap interval is set
> for pbuffer surface.
> 
> Test: CtsDisplayTestCases pass
> 
> Signed-off-by: samiuddi <sami.uddin.mohammad at intel.com>
> ---
> 
> Kindly ignore this patch 
> https://lists.freedesktop.org/archives/mesa-dev/2018-July/199098.html
> 
>  src/egl/drivers/dri2/platform_android.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
> index ca8708a..b5b960a 100644
> --- a/src/egl/drivers/dri2/platform_android.c
> +++ b/src/egl/drivers/dri2/platform_android.c
> @@ -485,7 +485,7 @@ droid_swap_interval(_EGLDriver *drv, _EGLDisplay *dpy,
>     struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
>     struct ANativeWindow *window = dri2_surf->window;
>  
> -   if (window->setSwapInterval(window, interval))
> +   if (window && window->setSwapInterval(window, interval))
>        return EGL_FALSE;

Shouldn't we return false if we couldn't set the swap interval?

I think this should be:
   if (!window || window->setSwapInterval(window, interval))
      return EGL_FALSE;

>  
>     surf->SwapInterval = interval;
> -- 
> 2.7.4
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list