From 453ceceec2e176dbb537dec9a073f51a561ae75c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 20 Jun 2024 07:42:30 -0400 Subject: [PATCH] zink: null check pipe loader config before use Fixes: e3ea55fef28 ("zink: don't print error messages when failing an implicit driver load") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11220 Part-of: --- src/gallium/drivers/zink/zink_screen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index ba1622b37b0..5bc8dc6b8c0 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -3256,12 +3256,12 @@ zink_internal_create_screen(const struct pipe_screen_config *config, int64_t dev struct zink_screen *screen = rzalloc(NULL, struct zink_screen); if (!screen) { - if (!config->driver_name_is_inferred) + if (!config || !config->driver_name_is_inferred) mesa_loge("ZINK: failed to allocate screen"); return NULL; } - screen->driver_name_is_inferred = config->driver_name_is_inferred; + screen->driver_name_is_inferred = config && config->driver_name_is_inferred; screen->drm_fd = -1; glsl_type_singleton_init_or_ref();