morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

dlfcn-util: fix potential dl handle leak

Browse Source 
Follow-up for 2c7bdaf9f1
This commit is contained in:
Mike Yuan
2025-11-25 03:52:57 +01:00
parent 2ba910ab06
commit f76f91b7c9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/basic/dlfcn-util.c
View File

@@ -84,6 +84,7 @@ void block_dlopen(void) {
}
int dlopen_safe(const char *filename, void **ret, const char **reterr_dlerror) {
_cleanup_(dlclosep) void *dl = NULL;
int r;
assert(filename);
@@ -99,8 +100,8 @@ int dlopen_safe(const char *filename, void **ret, const char **reterr_dlerror) {
flags |= RTLD_NOLOAD;
errno = 0;
void *p = dlopen(filename, flags);
if (!p) {
dl = dlopen(filename, flags);
if (!dl) {
if (dlopen_blocked) {
(void) dlerror(); /* consume error, so that no later call will return it */
@@ -121,7 +122,7 @@ int dlopen_safe(const char *filename, void **ret, const char **reterr_dlerror) {
}
if (ret)
*ret = TAKE_PTR(p);
*ret = TAKE_PTR(dl);
return 0;
}