mirror of
https://github.com/GrapheneOS/hardened_malloc.git
synced 2025-05-24 08:51:14 -04:00
support replacing C++ new/delete implementation
This adds support for sanity checks based on sized deallocation and will reduce the overhead of calls through the C++ allocator.
This commit is contained in:
parent
3dc49f8f73
commit
e6e9ac1fc9
3 changed files with 101 additions and 0 deletions
82
new.cc
Normal file
82
new.cc
Normal file
|
@ -0,0 +1,82 @@
|
|||
#include <stdlib.h>
|
||||
#include <new>
|
||||
#include <bits/functexcept.h>
|
||||
|
||||
#define noreturn
|
||||
|
||||
extern "C" {
|
||||
#include "malloc.h"
|
||||
#include "util.h"
|
||||
}
|
||||
|
||||
COLD static void *handle_out_of_memory(size_t size, bool nothrow) {
|
||||
void *ptr;
|
||||
|
||||
do {
|
||||
std::new_handler handler = std::get_new_handler();
|
||||
if (handler == nullptr) {
|
||||
break;
|
||||
}
|
||||
|
||||
try {
|
||||
handler();
|
||||
} catch (const std::bad_alloc &) {
|
||||
break;
|
||||
}
|
||||
|
||||
ptr = h_malloc(size);
|
||||
} while (ptr == nullptr);
|
||||
|
||||
if (ptr == nullptr && !nothrow) {
|
||||
std::__throw_bad_alloc();
|
||||
}
|
||||
return ptr;
|
||||
}
|
||||
|
||||
static inline void *new_impl(size_t size, bool nothrow) {
|
||||
void *ptr = h_malloc(size);
|
||||
if (likely(ptr != nullptr)) {
|
||||
return ptr;
|
||||
}
|
||||
return handle_out_of_memory(size, nothrow);
|
||||
}
|
||||
|
||||
void *operator new(size_t size) {
|
||||
return new_impl(size, false);
|
||||
}
|
||||
|
||||
void *operator new[](size_t size) {
|
||||
return new_impl(size, false);
|
||||
}
|
||||
|
||||
void *operator new(size_t size, const std::nothrow_t &) noexcept {
|
||||
return new_impl(size, true);
|
||||
}
|
||||
|
||||
void *operator new[](size_t size, const std::nothrow_t &) noexcept {
|
||||
return new_impl(size, true);
|
||||
}
|
||||
|
||||
void operator delete(void *ptr) noexcept {
|
||||
h_free(ptr);
|
||||
}
|
||||
|
||||
void operator delete[](void *ptr) noexcept {
|
||||
h_free(ptr);
|
||||
}
|
||||
|
||||
void operator delete(void *ptr, const std::nothrow_t &) noexcept {
|
||||
h_free(ptr);
|
||||
}
|
||||
|
||||
void operator delete[](void *ptr, const std::nothrow_t &) noexcept {
|
||||
h_free(ptr);
|
||||
}
|
||||
|
||||
void operator delete(void *ptr, size_t size) noexcept {
|
||||
h_free_sized(ptr, size);
|
||||
}
|
||||
|
||||
void operator delete[](void *ptr, size_t size) noexcept {
|
||||
h_free_sized(ptr, size);
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue