From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 27 Apr 2021 23:03:34 +0000 (-0500)
Subject: Don't add NULL dl search path components
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49ee832accb3e0cfb615df24044c93e7ff137199;p=thirdparty%2Ffreeradius-server.git

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 5d2c39f2746..727c1ed334d 100644
--- 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 aaefd911c79..76bca10904b 100644
--- 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