commit e9a111cfbb9e7a6ac04b92a2d3d00da90960ca5e
author Bartek Nowierski <bartekn@chromium.org> Tue Jul 11 18:17:20 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jul 11 18:17:20 2023 +0000
tree 0815b7792fcebf22be87dd077a9de306b159a286
parent 295ed7181b5504682905079b19213b562e1f7f15

Pass options directly to PartitionAllocator's ctor

Introduced in crrev.com/c/4668278

Change-Id: I420ac9e3c6286081569090a7a3904ea3b6bbb18b
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/109330
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

core/fxcrt/fx_memory_pa.cpp

diff --git a/core/fxcrt/fx_memory_pa.cpp b/core/fxcrt/fx_memory_pa.cpp
index f1153cb..598bc23 100644
--- a/core/fxcrt/fx_memory_pa.cpp
+++ b/core/fxcrt/fx_memory_pa.cpp
@@ -21,20 +21,20 @@
 #ifndef V8_ENABLE_SANDBOX
 partition_alloc::PartitionAllocator& GetArrayBufferPartitionAllocator() {
   static pdfium::base::NoDestructor<partition_alloc::PartitionAllocator>
-      s_array_buffer_allocator;
+      s_array_buffer_allocator(kOptions);
   return *s_array_buffer_allocator;
 }
 #endif  //  V8_ENABLE_SANDBOX
 
 partition_alloc::PartitionAllocator& GetGeneralPartitionAllocator() {
   static pdfium::base::NoDestructor<partition_alloc::PartitionAllocator>
-      s_general_allocator;
+      s_general_allocator(kOptions);
   return *s_general_allocator;
 }
 
 partition_alloc::PartitionAllocator& GetStringPartitionAllocator() {
   static pdfium::base::NoDestructor<partition_alloc::PartitionAllocator>
-      s_string_allocator;
+      s_string_allocator(kOptions);
   return *s_string_allocator;
 }
 
@@ -95,11 +95,13 @@
   static bool s_partition_allocators_initialized = false;
   if (!s_partition_allocators_initialized) {
     partition_alloc::PartitionAllocGlobalInit(FX_OutOfMemoryTerminate);
+    // These calls force the allocators to be created and initialized (via magic
+    // of static local variables).
 #ifndef V8_ENABLE_SANDBOX
-    GetArrayBufferPartitionAllocator().init(kOptions);
+    GetArrayBufferPartitionAllocator();
 #endif  // V8_ENABLE_SANDBOX
-    GetGeneralPartitionAllocator().init(kOptions);
-    GetStringPartitionAllocator().init(kOptions);
+    GetGeneralPartitionAllocator();
+    GetStringPartitionAllocator();
     s_partition_allocators_initialized = true;
   }
 }