RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 17:57:34 +00:00
Code Issues Activity Actions

Kernel: Use try_make_weak_ptr() instead of make_weak_ptr()

Browse source
This commit is contained in:
Idan Horowitz 2022-02-13 21:21:14 +02:00 • committed by Andreas Kling
parent 98c20b65cc
commit c8ab7bde3b
7 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/Syscalls/execve.cpp
View file

@ -404,10 +404,10 @@ static ErrorOr<LoadResult> load_elf_object(NonnullOwnPtr<Memory::AddressSpace> n
load_base_address,
elf_image.entry().offset(load_offset).get(),
executable_size,
AK::make_weak_ptr_if_nonnull(master_tls_region),
TRY(AK::try_make_weak_ptr_if_nonnull(master_tls_region)),
master_tls_size,
master_tls_alignment,
stack_region->make_weak_ptr()
TRY(stack_region->try_make_weak_ptr())
};
}

2
Kernel/Syscalls/mmap.cpp
View file

@ -523,7 +523,7 @@ ErrorOr<FlatPtr> Process::sys$allocate_tls(Userspace<const char*> initial_data,
auto range = TRY(address_space().try_allocate_range({}, size));
auto* region = TRY(address_space().allocate_region(range, "Master TLS"sv, PROT_READ | PROT_WRITE));
m_master_tls_region = region->make_weak_ptr();
m_master_tls_region = TRY(region->try_make_weak_ptr());
m_master_tls_size = size;
m_master_tls_alignment = PAGE_SIZE;