aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_process_memory__linux.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-base_process_memory__linux.cc')
-rw-r--r--www/chromium/files/patch-base_process_memory__linux.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/www/chromium/files/patch-base_process_memory__linux.cc b/www/chromium/files/patch-base_process_memory__linux.cc
index 1917ac874445..c025dc8205e5 100644
--- a/www/chromium/files/patch-base_process_memory__linux.cc
+++ b/www/chromium/files/patch-base_process_memory__linux.cc
@@ -1,6 +1,6 @@
---- base/process/memory_linux.cc.orig 2025-02-19 07:43:18 UTC
+--- base/process/memory_linux.cc.orig 2025-10-30 15:44:36 UTC
+++ base/process/memory_linux.cc
-@@ -28,6 +28,7 @@ void __libc_free(void*);
+@@ -29,6 +29,7 @@ void* __libc_calloc(size_t, size_t);
namespace base {
@@ -8,7 +8,7 @@
namespace {
void ReleaseReservationOrTerminate() {
-@@ -38,12 +39,14 @@ void ReleaseReservationOrTerminate() {
+@@ -39,12 +40,14 @@ void ReleaseReservationOrTerminate() {
}
} // namespace
@@ -23,7 +23,7 @@
// Set the new-out of memory handler.
std::set_new_handler(&ReleaseReservationOrTerminate);
// If we're using glibc's allocator, the above functions will override
-@@ -52,8 +55,10 @@ void EnableTerminationOnOutOfMemory() {
+@@ -53,8 +56,10 @@ void EnableTerminationOnOutOfMemory() {
#if PA_BUILDFLAG(USE_ALLOCATOR_SHIM)
allocator_shim::SetCallNewHandlerOnMallocFailure(true);
#endif
@@ -34,11 +34,11 @@
// ScopedAllowBlocking() has private constructor and it can only be used in
// friend classes/functions. Declaring a class is easier in this situation to
// avoid adding more dependency to thread_restrictions.h because of the
-@@ -111,6 +116,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr
+@@ -112,6 +117,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr
bool AdjustOOMScore(ProcessId process, int score) {
return AdjustOOMScoreHelper::AdjustOOMScore(process, score);
}
+#endif
- bool UncheckedMalloc(size_t size, void** result) {
+ bool UncheckedCalloc(size_t num_items, size_t size, void** result) {
#if PA_BUILDFLAG(USE_ALLOCATOR_SHIM)