Put some fx_memory.h functions in an internal namespace.
Separate out the functions / macros meant for external use vs. for
internal use. Give the internal functions consistent names that reflect
what they do.
Change-Id: I369547c2369fe7fa441d568a7d848575358b7be0
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/68070
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fxcrt/fx_memory.cpp b/core/fxcrt/fx_memory.cpp
index ca99926..9a9dd95 100644
--- a/core/fxcrt/fx_memory.cpp
+++ b/core/fxcrt/fx_memory.cpp
@@ -47,7 +47,7 @@
}
void* FXMEM_DefaultCalloc(size_t num_elems, size_t byte_size) {
- return FX_SafeAlloc(num_elems, byte_size);
+ return internal::Calloc(num_elems, byte_size);
}
void* FXMEM_DefaultRealloc(void* pointer, size_t new_size) {
@@ -71,7 +71,9 @@
abort();
}
-void* FX_SafeAlloc(size_t num_members, size_t member_size) {
+namespace internal {
+
+void* Calloc(size_t num_members, size_t member_size) {
FX_SAFE_SIZE_T total = member_size;
total *= num_members;
if (!total.IsValid())
@@ -84,7 +86,7 @@
"GeneralPartition");
}
-void* FX_SafeRealloc(void* ptr, size_t num_members, size_t member_size) {
+void* Realloc(void* ptr, size_t num_members, size_t member_size) {
FX_SAFE_SIZE_T size = num_members;
size *= member_size;
if (!size.IsValid())
@@ -96,30 +98,32 @@
"GeneralPartition");
}
-void* FX_AllocOrDie(size_t num_members, size_t member_size) {
+void* CallocOrDie(size_t num_members, size_t member_size) {
// TODO(tsepez): See if we can avoid the implicit memset(0).
- void* result = FX_SafeAlloc(num_members, member_size);
+ void* result = Calloc(num_members, member_size);
if (!result)
FX_OutOfMemoryTerminate(); // Never returns.
return result;
}
-void* FX_AllocOrDie2D(size_t w, size_t h, size_t member_size) {
+void* CallocOrDie2D(size_t w, size_t h, size_t member_size) {
if (w >= std::numeric_limits<size_t>::max() / h)
FX_OutOfMemoryTerminate(); // Never returns.
- return FX_AllocOrDie(w * h, member_size);
+ return CallocOrDie(w * h, member_size);
}
-void* FX_ReallocOrDie(void* ptr, size_t num_members, size_t member_size) {
- void* result = FX_SafeRealloc(ptr, num_members, member_size);
+void* ReallocOrDie(void* ptr, size_t num_members, size_t member_size) {
+ void* result = Realloc(ptr, num_members, member_size);
if (!result)
FX_OutOfMemoryTerminate(); // Never returns.
return result;
}
+} // namespace internal
+
void FX_Free(void* ptr) {
// TODO(palmer): Removing this check exposes crashes when PDFium callers
// attempt to free |nullptr|. Although libc's |free| allows freeing |NULL|, no
diff --git a/core/fxcrt/fx_memory.h b/core/fxcrt/fx_memory.h
index 6cb5f2e..d8f6661 100644
--- a/core/fxcrt/fx_memory.h
+++ b/core/fxcrt/fx_memory.h
@@ -33,23 +33,28 @@
// These never return nullptr, and must return cleared memory.
#define FX_Alloc(type, size) \
- static_cast<type*>(FX_AllocOrDie(size, sizeof(type)))
+ static_cast<type*>(internal::CallocOrDie(size, sizeof(type)))
#define FX_Alloc2D(type, w, h) \
- static_cast<type*>(FX_AllocOrDie2D(w, h, sizeof(type)))
+ static_cast<type*>(internal::CallocOrDie2D(w, h, sizeof(type)))
#define FX_Realloc(type, ptr, size) \
- static_cast<type*>(FX_ReallocOrDie(ptr, size, sizeof(type)))
+ static_cast<type*>(internal::ReallocOrDie(ptr, size, sizeof(type)))
// May return nullptr, but returns cleared memory otherwise.
#define FX_TryAlloc(type, size) \
- static_cast<type*>(FX_SafeAlloc(size, sizeof(type)))
+ static_cast<type*>(internal::Calloc(size, sizeof(type)))
#define FX_TryRealloc(type, ptr, size) \
- static_cast<type*>(FX_SafeRealloc(ptr, size, sizeof(type)))
+ static_cast<type*>(internal::Realloc(ptr, size, sizeof(type)))
-void* FX_SafeAlloc(size_t num_members, size_t member_size);
-void* FX_SafeRealloc(void* ptr, size_t num_members, size_t member_size);
-void* FX_AllocOrDie(size_t num_members, size_t member_size);
-void* FX_AllocOrDie2D(size_t w, size_t h, size_t member_size);
-void* FX_ReallocOrDie(void* ptr, size_t num_members, size_t member_size);
+namespace internal {
+
+void* Calloc(size_t num_members, size_t member_size);
+void* Realloc(void* ptr, size_t num_members, size_t member_size);
+void* CallocOrDie(size_t num_members, size_t member_size);
+void* CallocOrDie2D(size_t w, size_t h, size_t member_size);
+void* ReallocOrDie(void* ptr, size_t num_members, size_t member_size);
+
+} // namespace internal
+
void FX_Free(void* ptr);
// The FX_ArraySize(arr) macro returns the # of elements in an array arr.
diff --git a/core/fxcrt/fx_memory_wrappers.h b/core/fxcrt/fx_memory_wrappers.h
index 823fe76..6ce9ce3 100644
--- a/core/fxcrt/fx_memory_wrappers.h
+++ b/core/fxcrt/fx_memory_wrappers.h
@@ -49,7 +49,7 @@
pointer address(reference x) const noexcept { return &x; }
const_pointer address(const_reference x) const noexcept { return &x; }
pointer allocate(size_type n, const void* hint = 0) {
- return static_cast<pointer>(FX_AllocOrDie(n, sizeof(value_type)));
+ return FX_Alloc(value_type, n);
}
void deallocate(pointer p, size_type n) { FX_Free(p); }
size_type max_size() const noexcept {
