From 63a3a9b23b0a042fb751ed8f4e31bda25cf2ee23 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Wed, 13 Sep 2023 16:28:12 +0200 Subject: [PATCH] st/mesa: check renderbuffer before using it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rb being NULL is only checked for in the caller if no-error isn't used. cc: mesa-stable Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9747 Reviewed-by: Marek Olšák Part-of: --- src/mesa/state_tracker/st_cb_readpixels.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c index 341c7bfc763..f99140d7d74 100644 --- a/src/mesa/state_tracker/st_cb_readpixels.c +++ b/src/mesa/state_tracker/st_cb_readpixels.c @@ -427,6 +427,9 @@ st_ReadPixels(struct gl_context *ctx, GLint x, GLint y, uint8_t *map = NULL; int dst_x, dst_y; + if (rb == NULL) + return; + /* Validate state (to be sure we have up-to-date framebuffer surfaces) * and flush the bitmap cache prior to reading. */ st_validate_state(st, ST_PIPELINE_UPDATE_FB_STATE_MASK);