[PATCH wayland 3/3] shm: wl_shm_buffer_get_data() requires a valid pool.

[Marek Chalupa]

On Fri, Jun 26, 2015 at 6:35 PM, Derek Foreman <derekf at osg.samsung.com>
wrote:

> There's no situation where a shm buffer without a pool makes sense,
> so we enforce the pool's existence a little more rigidly.
>
> Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
> ---
>  src/wayland-shm.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/src/wayland-shm.c b/src/wayland-shm.c
> index da11743..79b3886 100644
> --- a/src/wayland-shm.c
> +++ b/src/wayland-shm.c
> @@ -353,10 +353,12 @@ wl_shm_buffer_get_stride(struct wl_shm_buffer
> *buffer)
>  WL_EXPORT void *
>  wl_shm_buffer_get_data(struct wl_shm_buffer *buffer)
>  {
> -       if (buffer->pool)
> -               return buffer->pool->data + buffer->offset;
> -       else
> -               return buffer + 1;
> +       assert(buffer->pool);
> +
> +       if (!buffer->pool)
> +               return NULL;
>

This condition is never true if the assert passed


> +
> +       return buffer->pool->data + buffer->offset;
>  }
>
>  WL_EXPORT uint32_t
> --
> 2.1.4
>
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
>

Regards,
Marek
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/wayland-devel/attachments/20150701/bf171fe0/attachment.html>