Don't add NULL dl search path components

diff --git a/src/lib/server/dl_module.c b/src/lib/server/dl_module.c
index 5d2c39f27465df81cd1e731dc5707d51c0a21cda..727c1ed334d4280ede6d6e1a5ec58c18750b5084 100644 (file)
--- a/src/lib/server/dl_module.c
+++ b/src/lib/server/dl_module.c
@@ -653,7 +653,7 @@ dl_module_loader_t *dl_module_loader_init(char const *lib_dir)
                TALLOC_FREE(dl_module_loader);
                return NULL;
        }
-       dl_search_path_prepend(dl_module_loader->dl_loader, lib_dir);
+       if (lib_dir) dl_search_path_prepend(dl_module_loader->dl_loader, lib_dir);
 
        dl_module_loader->inst_data_tree = fr_rb_talloc_alloc(dl_module_loader, dl_module_inst_t,
                                                              dl_module_inst_data_cmp, NULL);

diff --git a/src/lib/util/dl.h b/src/lib/util/dl.h
index aaefd911c792e934b6c4bcaee7bffa71b5d3bba7..76bca10904b580737e62479337e5d23d561b8a75 100644 (file)
--- a/src/lib/util/dl.h
+++ b/src/lib/util/dl.h
@@ -109,19 +109,19 @@ void                      dl_symbol_free_cb_unregister(dl_loader_t *dl_loader,
                                                     char const *symbol, dl_unload_t func);
 
 dl_t                   *dl_by_name(dl_loader_t *dl_loader, char const *name,
-                                   void *uctx, bool uctx_free);
+                                   void *uctx, bool uctx_free) CC_HINT(nonnull(1,2));
 
 int                    dl_free(dl_t const *dl);
 
-char const             *dl_search_path(dl_loader_t *dl_loader);
+char const             *dl_search_path(dl_loader_t *dl_loader) CC_HINT(nonnull);
 
 int                    dl_search_path_set(dl_loader_t *dl_loader, char const *lib_dir) CC_HINT(nonnull);
 
-int                    dl_search_path_prepend(dl_loader_t *dl_loader, char const *lib_dir);
+int                    dl_search_path_prepend(dl_loader_t *dl_loader, char const *lib_dir) CC_HINT(nonnull);
 
-int                    dl_search_path_append(dl_loader_t *dl_loader, char const *lib_dir);
+int                    dl_search_path_append(dl_loader_t *dl_loader, char const *lib_dir) CC_HINT(nonnull);
 
-void                   *dl_loader_uctx(dl_loader_t *dl_loader);
+void                   *dl_loader_uctx(dl_loader_t *dl_loader) CC_HINT(nonnull);
 
 dl_loader_t            *dl_loader_init(TALLOC_CTX *ctx, void *uctx, bool uctx_free, bool defer_symbol_init);
 #ifdef __cplusplus