From 0d21aa4a08991911f629272c1a68b148c625b0bb Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Fri, 7 Jun 2024 12:46:32 +0200
Subject: [PATCH] frontends/va: Fix crash in vaRenderPicture when decoder is
 NULL

Fixes: d1b794685f9 ("frontends/va: Send all bitstream buffers to driver at once")
Reviewed-by: Sil Vilerino <sivileri@microsoft.com>
Reviewed-by: Boyuan Zhang <Boyuan.Zhang@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29599>
---
 src/gallium/frontends/va/picture.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/frontends/va/picture.c b/src/gallium/frontends/va/picture.c
index ab1f43ce4fe..e7d5cbb86df 100644
--- a/src/gallium/frontends/va/picture.c
+++ b/src/gallium/frontends/va/picture.c
@@ -1077,7 +1077,9 @@ vlVaRenderPicture(VADriverContextP ctx, VAContextID context_id, VABufferID *buff
       }
    }
 
-   if (context->decoder->entrypoint == PIPE_VIDEO_ENTRYPOINT_BITSTREAM && context->bs.num_buffers) {
+   if (context->decoder &&
+       context->decoder->entrypoint == PIPE_VIDEO_ENTRYPOINT_BITSTREAM &&
+       context->bs.num_buffers) {
       context->decoder->decode_bitstream(context->decoder, context->target, &context->desc.base,
          context->bs.num_buffers, (const void * const*)context->bs.buffers, context->bs.sizes);
       context->bs.num_buffers = 0;