[Mesa-dev] [PATCH 2/4] egl_dri2: NULL check for xcb_dri2_get_buffers_reply()

Ian Romanick idr at freedesktop.org
Mon Feb 22 20:18:10 UTC 2016


On 02/11/2016 04:03 AM, Tapani Pälli wrote:
> From: Daniel Czarnowski <daniel.czarnowski at intel.com>
> 
> Without the check, unsuccessful xcb_dri2_get_buffers_reply(...) causes
> segmentation fault in dri2_get_buffers.
> 
> Signed-off-by: Matt Roper <matthew.d.roper at intel.com>
> Cc: "11.0 11.1" <mesa-stable at lists.freedesktop.org
> ---
>  src/egl/drivers/dri2/platform_x11.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
> index 08cbf2d..931ee51 100644
> --- a/src/egl/drivers/dri2/platform_x11.c
> +++ b/src/egl/drivers/dri2/platform_x11.c
> @@ -472,6 +472,8 @@ dri2_x11_get_buffers(__DRIdrawable * driDrawable,
>  					    dri2_surf->drawable,
>  					    count, count, attachments);
>     reply = xcb_dri2_get_buffers_reply (dri2_dpy->conn, cookie, NULL);
> +   if (reply == NULL)
> +      return NULL;

There should be a blank line here.  With that fixed, this patch is

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

>     buffers = xcb_dri2_get_buffers_buffers (reply);
>     if (buffers == NULL)
>        return NULL;
> 



More information about the mesa-dev mailing list