From 1b27820b769087c1ff42ddd505a19be18b182e92 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Sun, 4 Dec 2022 00:17:57 +0000 Subject: [PATCH] d3d12: Don't crash when libd3d12.so can't be found `d3d12_destroy_screen` is called by `d3d12_create_dxcore_screen` after `d3d12_init_screen_base` fails and attempts to call `util_dl_close` on a NULL pointer, leading to an abort. To fix this, only close the library after if it was actually opened. Cc: mesa-stable Reviewed-by: Jesse Natalie Part-of: (cherry picked from commit b3d1ae19f2f4d93cf0a5f45a598149ac4e8e05aa) --- .pick_status.json | 2 +- src/gallium/drivers/d3d12/d3d12_screen.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index fa6bed0..c28142a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4018,7 +4018,7 @@ "description": "d3d12: Don't crash when libd3d12.so can't be found", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp index 1cbe1fb..c21c60e 100644 --- a/src/gallium/drivers/d3d12/d3d12_screen.cpp +++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp @@ -741,7 +741,8 @@ d3d12_destroy_screen(struct d3d12_screen *screen) slab_destroy_parent(&screen->transfer_pool); mtx_destroy(&screen->submit_mutex); mtx_destroy(&screen->descriptor_pool_mutex); - util_dl_close(screen->d3d12_mod); + if (screen->d3d12_mod) + util_dl_close(screen->d3d12_mod); glsl_type_singleton_decref(); FREE(screen); } -- 2.7.4