beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-23 08:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibC: Don't format strings when asserting with an unstable heap

Browse source 
If we hit an assertion while the heap isn't in a stable state, we can't
rely on dynamic memory allocation because the malloc mutex is already
held and the heap is most likely corrupted. Instead, we need to bail
out fast before we make the situation even worse.
This commit is contained in:
Jean-Baptiste Boric 2021-09-17 18:13:50 +02:00 committed by Brian Gianforcaro
parent e215580147
commit 8043fcd466
Notes: sideshowbarker 2024-07-18 03:44:29 +09:00 
Author: https://github.com/boricj
Commit: https://github.com/SerenityOS/serenity/commit/8043fcd4665
Pull-request: https://github.com/SerenityOS/serenity/pull/10099
Reviewed-by: https://github.com/bgianfo ✅
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibC/assert.cpp
View file

@ -19,9 +19,11 @@ extern bool __stdio_is_initialized;
#ifndef NDEBUG
void __assertion_failed(const char* msg)
{
dbgln("ASSERTION FAILED: {}", msg);
if (__stdio_is_initialized)
warnln("ASSERTION FAILED: {}", msg);
if (__heap_is_stable) {
dbgln("ASSERTION FAILED: {}", msg);
if (__stdio_is_initialized)
warnln("ASSERTION FAILED: {}", msg);
}
Syscall::SC_set_coredump_metadata_params params {
{ "assertion", strlen("assertion") },

8
Userland/Libraries/LibC/malloc.cpp
View file

@ -26,8 +26,13 @@ public:
: m_mutex(mutex)
{
lock();
__heap_is_stable = false;
}
ALWAYS_INLINE ~PthreadMutexLocker()
{
__heap_is_stable = true;
unlock();
}
ALWAYS_INLINE ~PthreadMutexLocker() { unlock(); }
ALWAYS_INLINE void lock() { pthread_mutex_lock(&m_mutex); }
ALWAYS_INLINE void unlock() { pthread_mutex_unlock(&m_mutex); }
@ -38,6 +43,7 @@ private:
#define RECYCLE_BIG_ALLOCATIONS
static pthread_mutex_t s_malloc_mutex = PTHREAD_MUTEX_INITIALIZER;
bool __heap_is_stable = true;
constexpr size_t number_of_hot_chunked_blocks_to_keep_around = 16;
constexpr size_t number_of_cold_chunked_blocks_to_keep_around = 16;

1
Userland/Libraries/LibC/sys/internals.h
View file

@ -18,6 +18,7 @@ extern void __stdio_init();
extern void _init();
extern bool __environ_is_malloced;
extern bool __stdio_is_initialized;
extern bool __heap_is_stable;
int __cxa_atexit(AtExitFunction exit_function, void* parameter, void* dso_handle);
void __cxa_finalize(void* dso_handle);