Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DynamicLoader: Handle circular dependencies

This commit is contained in:
Bananymous 2025-04-15 22:34:14 +03:00
parent cc2b4967ea
commit e6026cb0b8
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
userspace/programs/DynamicLoader/main.cpp
View File

@ -163,8 +163,8 @@ struct LoadedElf
uintptr_t init_array; uintptr_t init_array;
size_t init_arraysz; size_t init_arraysz;
bool has_called_init; bool is_calling_init;
bool is_relocated; bool is_relocating;
char path[PATH_MAX]; char path[PATH_MAX];
}; };
@ -417,10 +417,9 @@ static uintptr_t handle_relocation(const LoadedElf& elf, const RelocT& reloc, bo
static void relocate_elf(LoadedElf& elf, bool lazy_load) static void relocate_elf(LoadedElf& elf, bool lazy_load)
{ {
// FIXME: handle circular dependencies if (elf.is_relocating)
if (elf.is_relocated)
return; return;
elf.is_relocating = true;
// do copy relocations // do copy relocations
if (elf.rel && elf.relent) if (elf.rel && elf.relent)
@ -498,8 +497,6 @@ static void relocate_elf(LoadedElf& elf, bool lazy_load)
} }
} }
} }
elf.is_relocated = true;
} }
extern "C" extern "C"
@ -879,8 +876,9 @@ static void initialize_environ(char** envp)
static void call_init_funcs(LoadedElf& elf, bool is_main_elf) static void call_init_funcs(LoadedElf& elf, bool is_main_elf)
{ {
if (elf.has_called_init) if (elf.is_calling_init)
return; return;
elf.is_calling_init = true;
if (elf.dynamics) if (elf.dynamics)
{ {
@ -895,7 +893,7 @@ static void call_init_funcs(LoadedElf& elf, bool is_main_elf)
} }
// main executable calls its init functions in _start // main executable calls its init functions in _start
if (elf.has_called_init || is_main_elf) if (is_main_elf)
return; return;
using init_t = void(*)(); using init_t = void(*)();