upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 02:32:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unify lt_dlopen() error handling

Browse source 
Make sure an error gets logged when any lt_dlopen() call in the source
tree fails.  Also make sure that NULL values returned by lt_dlerror()
are replaced with a generic error message to prevent passing NULL as an
argument for the %s format specifier.
This commit is contained in:
Ondřej Surý 2020-10-28 15:25:44 +01:00 committed by Michał Kępień
parent 0f49b02fc5
commit 4e9a58a3e6
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/named/unix/dlz_dlopen_driver.c
View file

@ -235,9 +235,13 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
cd->dl_handle = lt_dlopenext(cd->dl_path);
if (cd->dl_handle == NULL) {
const char *errmsg = lt_dlerror();
if (errmsg == NULL) {
errmsg = "unknown error";
}
dlopen_log(ISC_LOG_ERROR,
"dlz_dlopen failed to open library '%s': %s",
cd->dl_path, lt_dlerror());
cd->dl_path, errmsg);
result = ISC_R_FAILURE;
goto failed;
}

11
lib/dns/dyndb.c
View file

@ -95,7 +95,7 @@ load_symbol(lt_dlhandle handle, const char *filename, const char *symbol_name,
isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
DNS_LOGMODULE_DYNDB, ISC_LOG_ERROR,
"failed to lookup symbol %s in "
"dyndb module '%s': %s",
"DynDB module '%s': %s",
symbol_name, filename, errmsg);
return (ISC_R_FAILURE);
}
@ -128,6 +128,15 @@ load_library(isc_mem_t *mctx, const char *filename, const char *instname,
handle = lt_dlopen(filename);
if (handle == NULL) {
const char *errmsg = lt_dlerror();
if (errmsg == NULL) {
errmsg = "unknown error";
}
isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
DNS_LOGMODULE_DYNDB, ISC_LOG_ERROR,
"failed to dlopen() DynDB instance '%s' driver "
"'%s': %s",
instname, filename, errmsg);
CHECK(ISC_R_FAILURE);
}