From 7726a581626bbb72d6ab294ae1adbad4ca10dfb0 Mon Sep 17 00:00:00 2001 From: Chris Palmer Date: Thu, 22 Jun 2017 10:10:17 -0700 Subject: Add a |gGeneralPartitionAllocator| and use it in the |FX_*Alloc| wrappers. BUG=pdfium:690 Change-Id: I922279e4bdc8b411f47f49798155e8f9118c1396 Reviewed-on: https://pdfium-review.googlesource.com/6552 Commit-Queue: Chris Palmer Reviewed-by: Lei Zhang --- core/fxcrt/fx_memory.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'core/fxcrt/fx_memory.cpp') diff --git a/core/fxcrt/fx_memory.cpp b/core/fxcrt/fx_memory.cpp index 2afcbcecee..589a4cf508 100644 --- a/core/fxcrt/fx_memory.cpp +++ b/core/fxcrt/fx_memory.cpp @@ -5,10 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/fxcrt/fx_memory.h" +#include "core/fxcrt/fx_safe_types.h" #include // For abort(). pdfium::base::PartitionAllocatorGeneric gArrayBufferPartitionAllocator; +pdfium::base::PartitionAllocatorGeneric gGeneralPartitionAllocator; pdfium::base::PartitionAllocatorGeneric gStringPartitionAllocator; void FXMEM_InitializePartitionAlloc() { @@ -16,25 +18,31 @@ void FXMEM_InitializePartitionAlloc() { if (!s_gPartitionAllocatorsInitialized) { pdfium::base::PartitionAllocGlobalInit(FX_OutOfMemoryTerminate); gArrayBufferPartitionAllocator.init(); + gGeneralPartitionAllocator.init(); gStringPartitionAllocator.init(); s_gPartitionAllocatorsInitialized = true; } } +// TODO(palmer): Remove the |flags| argument. void* FXMEM_DefaultAlloc(size_t byte_size, int flags) { - return (void*)malloc(byte_size); + return pdfium::base::PartitionAllocGeneric(gGeneralPartitionAllocator.root(), + byte_size, "GeneralPartition"); } void* FXMEM_DefaultCalloc(size_t num_elems, size_t byte_size) { - return calloc(num_elems, byte_size); + return FX_SafeAlloc(num_elems, byte_size); } +// TODO(palmer): Remove the |flags| argument. void* FXMEM_DefaultRealloc(void* pointer, size_t new_size, int flags) { - return realloc(pointer, new_size); + return pdfium::base::PartitionReallocGeneric( + gGeneralPartitionAllocator.root(), pointer, new_size, "GeneralPartition"); } +// TODO(palmer): Remove the |flags| argument. void FXMEM_DefaultFree(void* pointer, int flags) { - free(pointer); + pdfium::base::PartitionFree(pointer); } NEVER_INLINE void FX_OutOfMemoryTerminate() { -- cgit v1.2.3