nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2025-01-03 11:11:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

mem: fix rare crash/logic error in heap allocation code

Browse source
This commit is contained in:
Michael Scire 2021-05-26 20:43:03 -07:00
parent c790d03693
commit 0f2855ada8
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/libstratosphere/source/mem/impl/heap/mem_impl_heap_tls_heap_central.cpp
View file

@ -976,13 +976,14 @@ namespace ams::mem::impl::heap {
return span; return span;
} }
} else { } else {
const size_t prev_pages = span->num_pages;
Span *new_span = this->AllocateSpanStruct(); Span *new_span = this->AllocateSpanStruct();
if (new_span == nullptr) { if (new_span == nullptr) {
return nullptr; return nullptr;
} }
auto new_span_guard = SCOPE_GUARD { this->FreeSpanToSpanPage(new_span); }; auto new_span_guard = SCOPE_GUARD { this->FreeSpanToSpanPage(new_span); };
const size_t prev_pages = span->num_pages;
span = GetSpanFromPointer(std::addressof(this->span_table), span->start.p); span = GetSpanFromPointer(std::addressof(this->span_table), span->start.p);
const size_t found_pages = span->num_pages; const size_t found_pages = span->num_pages;