From b187e4d8e33a0bf06c1d6ac122c30b309edb60c2 Mon Sep 17 00:00:00 2001 From: "Neil R. Spruit" Date: Fri, 20 Jun 2025 09:54:30 -0700 Subject: [PATCH] fix destroy of loader dispatch given invalid init Signed-off-by: Neil R. Spruit --- source/loader/ze_loader.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/source/loader/ze_loader.cpp b/source/loader/ze_loader.cpp index b3ef06ad..d89b5b29 100644 --- a/source/loader/ze_loader.cpp +++ b/source/loader/ze_loader.cpp @@ -682,10 +682,13 @@ namespace loader } } } - loader_driver_ddi::zeDestroyDDiDriverTables(loader::loaderDispatch->pCore); - loader_driver_ddi::zetDestroyDDiDriverTables(loader::loaderDispatch->pTools); - loader_driver_ddi::zesDestroyDDiDriverTables(loader::loaderDispatch->pSysman); - delete loader::loaderDispatch; + if (loader::loaderDispatch) { + loader_driver_ddi::zeDestroyDDiDriverTables(loader::loaderDispatch->pCore); + loader_driver_ddi::zetDestroyDDiDriverTables(loader::loaderDispatch->pTools); + loader_driver_ddi::zesDestroyDDiDriverTables(loader::loaderDispatch->pSysman); + delete loader::loaderDispatch; + loader::loaderDispatch = nullptr; + } }; void context_t::add_loader_version(){