From 02dd03ff3ce07362c1c1636d537f90ad96c87c49 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Mon, 28 Jun 2021 14:26:54 +1000 Subject: [PATCH] i965: don't crash on incorrect texture use Cc: mesa-stable Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4995 Reviewed-by: Ian Romanick Reviewed-by: Lionel Landwerlin Part-of: --- src/mesa/drivers/dri/i965/brw_tex_validate.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mesa/drivers/dri/i965/brw_tex_validate.c b/src/mesa/drivers/dri/i965/brw_tex_validate.c index 696655673fd..36803cc2640 100644 --- a/src/mesa/drivers/dri/i965/brw_tex_validate.c +++ b/src/mesa/drivers/dri/i965/brw_tex_validate.c @@ -104,6 +104,8 @@ brw_finalize_mipmap_tree(struct brw_context *brw, assert(!tObj->Immutable || brw->screen->devinfo.ver < 6); firstImage = brw_texture_image(tObj->Image[0][tObj->Attrib.BaseLevel]); + if (!firstImage) + return; /* Check tree can hold all active levels. Check tree matches * target, imageFormat, etc.