justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-10 00:14:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

[kernel] Protect against null ctor

Browse Source 
This should never happen, but if there's a null in the ctors list, don't
just blindly call it.
This commit is contained in:
Justin C. Miller
2021-04-07 23:01:26 -07:00
parent 4436145eaf
commit 19a799656a
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/kernel/main.cpp
View File

@@ -78,7 +78,7 @@ run_constructors()
void (**p)(void) = &__ctors; void (**p)(void) = &__ctors;
while (p < &__ctors_end) { while (p < &__ctors_end) {
void (*ctor)(void) = *p++; void (*ctor)(void) = *p++;
ctor(); if (ctor) ctor();
} }
} }
@@ -126,7 +126,6 @@ kernel_main(args::header *header)
extern cpu_data g_bsp_cpu_data; extern cpu_data g_bsp_cpu_data;
extern uintptr_t idle_stack_end; extern uintptr_t idle_stack_end;
cpu_data *cpu = &g_bsp_cpu_data; cpu_data *cpu = &g_bsp_cpu_data;
kutil::memset(cpu, 0, sizeof(cpu_data)); kutil::memset(cpu, 0, sizeof(cpu_data));