From a3c06323422937e6a79a12da3cb677363003f97b Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Date: Tue, 29 Jul 2025 14:36:52 +0200
Subject: [PATCH] mesa/st: check buf before dereferencing it
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It can be NULL.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36411>
---
 src/mesa/state_tracker/st_draw_feedback.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_draw_feedback.c b/src/mesa/state_tracker/st_draw_feedback.c
index 9aeb8fe353b..1cd70f7730b 100644
--- a/src/mesa/state_tracker/st_draw_feedback.c
+++ b/src/mesa/state_tracker/st_draw_feedback.c
@@ -198,11 +198,12 @@ st_feedback_draw_vbo(struct gl_context *ctx,
       struct gl_buffer_binding *binding =
          &st->ctx->UniformBufferBindings[prog->sh.UniformBlocks[i]->Binding];
       struct gl_buffer_object *st_obj = binding->BufferObject;
-      struct pipe_resource *buf = st_obj->buffer;
 
-      if (!buf)
+      if (!st_obj || !st_obj->buffer)
          continue;
 
+      struct pipe_resource *buf = st_obj->buffer;
+
       unsigned offset = binding->Offset;
       unsigned size = buf->width0 - offset;