From ab4221c772b4ccf535849062bb8f06c73b94548f Mon Sep 17 00:00:00 2001 From: foxit Date: Mon, 7 Jul 2014 13:53:16 -0700 Subject: Integer overflow in fx_basic.h and fx_memory.h BUG=382656 R=palmer@chromium.org Review URL: https://codereview.chromium.org/334573007 --- core/include/fxcrt/fx_memory.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'core/include/fxcrt/fx_memory.h') diff --git a/core/include/fxcrt/fx_memory.h b/core/include/fxcrt/fx_memory.h index cf795fa869..1869ccc0e8 100644 --- a/core/include/fxcrt/fx_memory.h +++ b/core/include/fxcrt/fx_memory.h @@ -117,13 +117,13 @@ extern "C" { #endif typedef struct _IFX_Allocator { - void* (*m_AllocDebug)(struct _IFX_Allocator* pAllocator, size_t size, FX_LPCSTR file, int line); + void* (*m_AllocDebug)(struct _IFX_Allocator* pAllocator, size_t num, size_t size, FX_LPCSTR file, int line); - void* (*m_Alloc)(struct _IFX_Allocator* pAllocator, size_t size); + void* (*m_Alloc)(struct _IFX_Allocator* pAllocator, size_t num, size_t size); - void* (*m_ReallocDebug)(struct _IFX_Allocator* pAllocator, void* p, size_t size, FX_LPCSTR file, int line); + void* (*m_ReallocDebug)(struct _IFX_Allocator* pAllocator, void* p, size_t num, size_t size, FX_LPCSTR file, int line); - void* (*m_Realloc)(struct _IFX_Allocator* pAllocator, void* p, size_t size); + void* (*m_Realloc)(struct _IFX_Allocator* pAllocator, void* p, size_t num, size_t size); void (*m_Free)(struct _IFX_Allocator* pAllocator, void* p); } IFX_Allocator; @@ -134,17 +134,17 @@ IFX_Allocator* FXMEM_GetDefAllocator(); #ifdef _DEBUG #define FX_Allocator_Alloc(fxAllocator, type, size) \ - ((fxAllocator) ? (type*)(fxAllocator)->m_AllocDebug((fxAllocator), (size) * sizeof(type), __FILE__, __LINE__) : (FX_Alloc(type, size))) + ((fxAllocator) ? (type*)(fxAllocator)->m_AllocDebug((fxAllocator), (size), sizeof(type), __FILE__, __LINE__) : (FX_Alloc(type, size))) #define FX_Allocator_Realloc(fxAllocator, type, ptr, new_size) \ - ((fxAllocator) ? (type*)(fxAllocator)->m_ReallocDebug((fxAllocator), (ptr), (new_size) * sizeof(type), __FILE__, __LINE__) : (FX_Realloc(type, ptr, new_size))) + ((fxAllocator) ? (type*)(fxAllocator)->m_ReallocDebug((fxAllocator), (ptr), (new_size) , sizeof(type), __FILE__, __LINE__) : (FX_Realloc(type, ptr, new_size))) #else #define FX_Allocator_Alloc(fxAllocator, type, size) \ - ((fxAllocator) ? (type*)(fxAllocator)->m_Alloc((fxAllocator), (size) * sizeof(type)) : (FX_Alloc(type, size))) + ((fxAllocator) ? (type*)(fxAllocator)->m_Alloc((fxAllocator), (size), sizeof(type)) : (FX_Alloc(type, size))) #define FX_Allocator_Realloc(fxAllocator, type, ptr, new_size) \ - ((fxAllocator) ? (type*)(fxAllocator)->m_Realloc((fxAllocator), (ptr), (new_size) * sizeof(type)) : (FX_Realloc(type, ptr, new_size))) + ((fxAllocator) ? (type*)(fxAllocator)->m_Realloc((fxAllocator), (ptr), (new_size), sizeof(type)) : (FX_Realloc(type, ptr, new_size))) #endif #define FX_Allocator_Free(fxAllocator, ptr) \ ((fxAllocator) ? (fxAllocator)->m_Free((fxAllocator), (ptr)) : (FX_Free(ptr))) -- cgit v1.2.3