commit 39e685ccd37e89fe422e52a7f317fe82dbe78977
author Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Sun Jan 19 19:47:31 2020 +0100
committer Lenny Komow <lenny@lunarg.com> Tue Feb 18 11:44:55 2020 -0700
tree 13fd4de029a1ebe06131aa6db0d6824c832dcfa6
parent dc33ddeb7547d155437eb2a56a388f555df335c9

loader: Deal with failure loading implicit layer libraries.

If the error is not dealt with, we'll end up calling dlclose(NULL)
later.

loader/trampoline.c

diff --git a/loader/trampoline.c b/loader/trampoline.c
index 6cbe2cb..a6a37f0 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -135,6 +135,12 @@
         }
 
         loader_platform_dl_handle layer_lib = loader_platform_open_library(layers.list[i].lib_name);
+        if (layer_lib == NULL) {
+            loader_log(NULL, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, "%s: Unable to load implicit layer library \"%s\"", __FUNCTION__,
+                       layers.list[i].lib_name);
+            continue;
+        }
+
         libs[lib_count++] = layer_lib;
         void *pfn = loader_platform_get_proc_address(layer_lib,
                                                      layers.list[i].pre_instance_functions.enumerate_instance_extension_properties);
@@ -223,6 +229,12 @@
         }
 
         loader_platform_dl_handle layer_lib = loader_platform_open_library(layers.list[i].lib_name);
+        if (layer_lib == NULL) {
+            loader_log(NULL, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, "%s: Unable to load implicit layer library \"%s\"", __FUNCTION__,
+                       layers.list[i].lib_name);
+            continue;
+        }
+
         libs[lib_count++] = layer_lib;
         void *pfn =
             loader_platform_get_proc_address(layer_lib, layers.list[i].pre_instance_functions.enumerate_instance_layer_properties);
@@ -311,6 +323,12 @@
         }
 
         loader_platform_dl_handle layer_lib = loader_platform_open_library(layers.list[i].lib_name);
+        if (layer_lib == NULL) {
+            loader_log(NULL, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, "%s: Unable to load implicit layer library \"%s\"", __FUNCTION__,
+                       layers.list[i].lib_name);
+            continue;
+        }
+
         libs[lib_count++] = layer_lib;
         void *pfn = loader_platform_get_proc_address(layer_lib,
                                                      layers.list[i].pre_instance_functions.enumerate_instance_version);