summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRyan Harrison <rharrison@chromium.org>2018-05-16 19:19:22 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-05-16 19:19:22 +0000
commit98ec53359b8e61e717440f280d3fcc101fe140bb (patch)
tree013925477fa27d2e1077ceaebab5fdf1ee6432e3 /core
parentcda8e00478e97f005fc1d22bc01af7818e6f5101 (diff)
downloadpdfium-98ec53359b8e61e717440f280d3fcc101fe140bb.tar.xz
Add support for PartionRealloc to return nullptr
Currently the PartitionRealloc code path will only exit, with no option to return nullptr on failure, unlike PartitionAlloc code path. This CL refactors the realloc code path to be similar to alloc code path, following the upstream patch: https://chromium-review.googlesource.com/c/chromium/src/+/1044971 This also changes the version of realloc exposed to third party C libs to have the nullptr behaviour, like the exposed version of alloc. This CL is a redo of https://pdfium-review.googlesource.com/c/pdfium/+/31990 BUG=chromium:783022 Change-Id: Ib1b659079585dfd0423d683b8a2c7b6758a22a01 Reviewed-on: https://pdfium-review.googlesource.com/32613 Commit-Queue: Ryan Harrison <rharrison@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org> Reviewed-by: Chris Palmer <palmer@chromium.org>
Diffstat (limited to 'core')
-rw-r--r--core/fxcrt/fx_memory.cpp5
-rw-r--r--core/fxcrt/fx_memory.h6
2 files changed, 6 insertions, 5 deletions
diff --git a/core/fxcrt/fx_memory.cpp b/core/fxcrt/fx_memory.cpp
index 6a135ae0f8..006e03031e 100644
--- a/core/fxcrt/fx_memory.cpp
+++ b/core/fxcrt/fx_memory.cpp
@@ -35,8 +35,9 @@ void* FXMEM_DefaultCalloc(size_t num_elems, size_t byte_size) {
}
void* FXMEM_DefaultRealloc(void* pointer, size_t new_size) {
- return pdfium::base::PartitionReallocGeneric(
- gGeneralPartitionAllocator.root(), pointer, new_size, "GeneralPartition");
+ return pdfium::base::PartitionReallocGenericFlags(
+ gGeneralPartitionAllocator.root(), pdfium::base::PartitionAllocReturnNull,
+ pointer, new_size, "GeneralPartition");
}
void FXMEM_DefaultFree(void* pointer) {
diff --git a/core/fxcrt/fx_memory.h b/core/fxcrt/fx_memory.h
index f7e6d67520..707e084211 100644
--- a/core/fxcrt/fx_memory.h
+++ b/core/fxcrt/fx_memory.h
@@ -57,9 +57,9 @@ inline void* FX_SafeRealloc(void* ptr, size_t num_members, size_t member_size) {
if (!size.IsValid())
return nullptr;
- return pdfium::base::PartitionReallocGeneric(
- gGeneralPartitionAllocator.root(), ptr, size.ValueOrDie(),
- "GeneralPartition");
+ return pdfium::base::PartitionReallocGenericFlags(
+ gGeneralPartitionAllocator.root(), pdfium::base::PartitionAllocReturnNull,
+ ptr, size.ValueOrDie(), "GeneralPartition");
}
inline void* FX_AllocOrDie(size_t num_members, size_t member_size) {