Differential D36179 Diff 109344 www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_allocator__shim__default__dispatch__to__glibc.cc
Changeset View
Changeset View
Standalone View
Standalone View
www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_allocator__shim__default__dispatch__to__glibc.cc
- This file was added.
--- src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2021-11-25 09:20:12 UTC | |||||
+++ src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc | |||||
@@ -6,18 +6,28 @@ | |||||
#include "base/compiler_specific.h" | |||||
#include <dlfcn.h> | |||||
-#include <malloc.h> | |||||
+#include <stdio.h> | |||||
+#include <stdlib.h> | |||||
+#include <malloc_np.h> | |||||
// This translation unit defines a default dispatch for the allocator shim which | |||||
// routes allocations to libc functions. | |||||
-// The code here is strongly inspired from tcmalloc's libc_override_glibc.h. | |||||
+// The code here is strongly inspired from tcmalloc's override_glibc.h. | |||||
extern "C" { | |||||
-void* __libc_malloc(size_t size); | |||||
-void* __libc_calloc(size_t n, size_t size); | |||||
-void* __libc_realloc(void* address, size_t size); | |||||
-void* __libc_memalign(size_t alignment, size_t size); | |||||
-void __libc_free(void* ptr); | |||||
+void* __malloc(size_t size); | |||||
+void* __calloc(size_t n, size_t size); | |||||
+void* __realloc(void* address, size_t len); | |||||
+void* __memalign(size_t alignment, size_t size) { | |||||
+ void *ret; | |||||
+ if (__posix_memalign(&ret, alignment, size) != 0) { | |||||
+ return nullptr; | |||||
+ } else { | |||||
+ return ret; | |||||
+ } | |||||
+} | |||||
+int __posix_memalign(void **ptr, size_t alignment, size_t size); | |||||
+void __free(void* ptr); | |||||
} // extern "C" | |||||
namespace { | |||||
@@ -25,32 +35,32 @@ namespace { | |||||
using base::allocator::AllocatorDispatch; | |||||
void* GlibcMalloc(const AllocatorDispatch*, size_t size, void* context) { | |||||
- return __libc_malloc(size); | |||||
+ return __malloc(size); | |||||
} | |||||
void* GlibcCalloc(const AllocatorDispatch*, | |||||
size_t n, | |||||
size_t size, | |||||
void* context) { | |||||
- return __libc_calloc(n, size); | |||||
+ return __calloc(n, size); | |||||
} | |||||
void* GlibcRealloc(const AllocatorDispatch*, | |||||
void* address, | |||||
size_t size, | |||||
void* context) { | |||||
- return __libc_realloc(address, size); | |||||
+ return __realloc(address, size); | |||||
} | |||||
void* GlibcMemalign(const AllocatorDispatch*, | |||||
size_t alignment, | |||||
size_t size, | |||||
void* context) { | |||||
- return __libc_memalign(alignment, size); | |||||
+ return __memalign(alignment, size); | |||||
} | |||||
void GlibcFree(const AllocatorDispatch*, void* address, void* context) { | |||||
- __libc_free(address); | |||||
+ __free(address); | |||||
} | |||||
NO_SANITIZE("cfi-icall") |