[Mesa-stable] [Mesa-dev] [PATCH] radeonsi: correct NULL-pointer check in si_upload_const_buffer

[Bas Nieuwenhuizen]

Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

On Fri, Apr 29, 2016 at 7:13 PM, Nicolai Hähnle <nhaehnle at gmail.com> wrote:
> From: Nicolai Hähnle <nicolai.haehnle at amd.com>
>
> Cc: "11.1 11.2" <mesa-stable at lists.freedesktop.org>
> ---
>  src/gallium/drivers/radeonsi/si_descriptors.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
> index fbaf804..0b32045 100644
> --- a/src/gallium/drivers/radeonsi/si_descriptors.c
> +++ b/src/gallium/drivers/radeonsi/si_descriptors.c
> @@ -779,7 +779,7 @@ void si_upload_const_buffer(struct si_context *sctx, struct r600_resource **rbuf
>
>         u_upload_alloc(sctx->b.uploader, 0, size, 256, const_offset,
>                        (struct pipe_resource**)rbuffer, &tmp);
> -       if (rbuffer)
> +       if (*rbuffer)
>                 util_memcpy_cpu_to_le32(tmp, ptr, size);
>  }
>
> --
> 2.7.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev