Remove custom memory manager

core/src/fxcrt/fx_basic_array.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/fxcrt/fx_basic.h"
-CFX_BasicArray::CFX_BasicArray(int unit_size, IFX_Allocator* pAllocator)
-    : m_pAllocator(pAllocator)
-    , m_pData(NULL)
+CFX_BasicArray::CFX_BasicArray(int unit_size)
+    : m_pData(NULL)
     , m_nSize(0)
     , m_nMaxSize(0)
     , m_nGrowBy(0)
 {
     if (unit_size < 0 || unit_size > (1 << 28)) {
         m_nUnitSize = 4;
     } else {
         m_nUnitSize = unit_size;
     }
 }
 CFX_BasicArray::~CFX_BasicArray()
 {
-    FX_Allocator_Free(m_pAllocator, m_pData);
+    FX_Free(m_pData);
 }
 FX_BOOL CFX_BasicArray::SetSize(int nNewSize, int nGrowBy)
 {
     if (nNewSize < 0 || nNewSize > (1 << 28) / m_nUnitSize) {
         if (m_pData != NULL) {
-            FX_Allocator_Free(m_pAllocator, m_pData);
+            FX_Free(m_pData);
             m_pData = NULL;
-                }
+        }
         m_nSize = m_nMaxSize = 0;
         return FALSE;
     }
     if (nGrowBy >= 0) {
         m_nGrowBy = nGrowBy;
     }
     if (nNewSize == 0) {
         if (m_pData != NULL) {
-            FX_Allocator_Free(m_pAllocator, m_pData);
+            FX_Free(m_pData);
             m_pData = NULL;
         }
         m_nSize = m_nMaxSize = 0;
     } else if (m_pData == NULL) {
-        m_pData = FX_Allocator_Alloc(m_pAllocator, FX_BYTE, nNewSize * m_nUnitSize);
+        m_pData = FX_Alloc(FX_BYTE, nNewSize * m_nUnitSize);

[palmer, 2014/07/07 19:17:53]

Potential integer overflow.

         if (!m_pData) {
             m_nSize = m_nMaxSize = 0;
             return FALSE;
         }
         FXSYS_memset32(m_pData, 0, nNewSize * m_nUnitSize);

[palmer, 2014/07/07 19:17:53]

Integer overflow here and on line 53. You probably want calloc.

[Bo Xu, 2014/07/08 19:22:16]

Here should e handled by the check in line 26

On 2014/07/07 19:17:53, Chromium Palmer wrote:

         m_nSize = m_nMaxSize = nNewSize;
     } else if (nNewSize <= m_nMaxSize) {
         if (nNewSize > m_nSize) {
             FXSYS_memset32(m_pData + m_nSize * m_nUnitSize, 0, (nNewSize - m_nSize) * m_nUnitSize);
         }
         m_nSize = nNewSize;
     } else {
         int nGrowBy = m_nGrowBy;
         if (nGrowBy == 0) {
             nGrowBy = m_nSize / 8;
             nGrowBy = (nGrowBy < 4) ? 4 : ((nGrowBy > 1024) ? 1024 : nGrowBy);
         }
         int nNewMax;
         if (nNewSize < m_nMaxSize + nGrowBy) {
             nNewMax = m_nMaxSize + nGrowBy;
         } else {
             nNewMax = nNewSize;
         }
-        FX_LPBYTE pNewData = FX_Allocator_Realloc(m_pAllocator, FX_BYTE, m_pData, nNewMax * m_nUnitSize);
+        FX_LPBYTE pNewData = FX_Realloc(FX_BYTE, m_pData, nNewMax * m_nUnitSize);

[palmer, 2014/07/07 19:17:53]

Potential integer overflow.

         if (pNewData == NULL) {
             return FALSE;
         }
         FXSYS_memset32(pNewData + m_nSize * m_nUnitSize, 0, (nNewMax - m_nSize) * m_nUnitSize);

[palmer, 2014/07/07 19:17:53]

Potential integer overflow. Another reason to stick to calloc.

[Bo Xu, 2014/07/08 19:31:25]

Here the integer overflow has been checked by line 26.

On 2014/07/07 19:17:53, Chromium Palmer wrote:

[palmer, 2014/07/08 22:24:13]

I am not sure that is a sufficient check (as explained in the next comment).

         m_pData = pNewData;
         m_nSize = nNewSize;
         m_nMaxSize = nNewMax;
     }
     return TRUE;
 }
 FX_BOOL CFX_BasicArray::Append(const CFX_BasicArray& src)
 {
     int nOldSize = m_nSize;
     if (!SetSize(m_nSize + src.m_nSize, -1)) {
         return FALSE;
     }
     FXSYS_memcpy32(m_pData + nOldSize * m_nUnitSize, src.m_pData, src.m_nSize * m_nUnitSize);

[palmer, 2014/07/07 19:17:53]

Not sure if all this arithmetic is safe against overflow.

[Bo Xu, 2014/07/08 19:22:16]

The function SetSize does the overflow check, so here should be ok.

On 2014/07/07 19:17:53, Chromium Palmer wrote:

[palmer, 2014/07/08 22:24:13]

I'm not sure. The expression "m_nSize + src.m_nSize" on line 82 could have
overflowed, for example.

And I'm not entirely sure about the implementation of SetSize. For example:

 45         m_pData = FX_Allocator_Alloc(m_pAllocator, FX_BYTE, nNewSize *
m_nUnitSize);

but |nNewSize| is only somewhat constrained:

 27     if (nNewSize < 0 || nNewSize > (1 << 28) / m_nUnitSize) {

and |m_nUnitSize| is not constrained at all.

     return TRUE;
 }
 FX_BOOL CFX_BasicArray::Copy(const CFX_BasicArray& src)
 {
     if (!SetSize(src.m_nSize, -1)) {
         return FALSE;
     }
     FXSYS_memcpy32(m_pData, src.m_pData, src.m_nSize * m_nUnitSize);
     return TRUE;
 }
@@ skipping 43 matching lines @@
     FXSYS_memcpy32(m_pData + nStartIndex * m_nUnitSize, pNewArray->m_pData, pNewArray->m_nSize * m_nUnitSize);
     return TRUE;
 }
 const void* CFX_BasicArray::GetDataPtr(int index) const
 {
     if (index < 0 || index >= m_nSize || m_pData == NULL) {
         return NULL;
     }
     return m_pData + index * m_nUnitSize;
 }
-CFX_BaseSegmentedArray::CFX_BaseSegmentedArray(int unit_size, int segment_units, int index_size, IFX_Allocator* pAllocator)
-    : m_pAllocator(pAllocator)
-    , m_UnitSize(unit_size)
+CFX_BaseSegmentedArray::CFX_BaseSegmentedArray(int unit_size, int segment_units, int index_size)
+    : m_UnitSize(unit_size)
     , m_SegmentSize(segment_units)
     , m_IndexSize(index_size)
     , m_IndexDepth(0)
     , m_DataSize(0)
     , m_pIndex(NULL)
 {
 }
 void CFX_BaseSegmentedArray::SetUnitSize(int unit_size, int segment_units, int index_size)
 {
     ASSERT(m_DataSize == 0);
     m_UnitSize = unit_size;
     m_SegmentSize = segment_units;
     m_IndexSize = index_size;
 }
 CFX_BaseSegmentedArray::~CFX_BaseSegmentedArray()
 {
     RemoveAll();
 }
-static void _ClearIndex(IFX_Allocator* pAllcator, int level, int size, void** pIndex)
+static void _ClearIndex(int level, int size, void** pIndex)
 {
     if (level == 0) {
-        FX_Allocator_Free(pAllcator, pIndex);
+        FX_Free(pIndex);
         return;
     }
-    for (int i = 0; i < size; i ++) {
+    for (int i = 0; i < size; i++) {
         if (pIndex[i] == NULL) {
             continue;
         }
-        _ClearIndex(pAllcator, level - 1, size, (void**)pIndex[i]);
+        _ClearIndex(level - 1, size, (void**)pIndex[i]);
     }
-    FX_Allocator_Free(pAllcator, pIndex);
+    FX_Free(pIndex);
 }
 void CFX_BaseSegmentedArray::RemoveAll()
 {
     if (m_pIndex == NULL) {
         return;
     }
-    _ClearIndex(m_pAllocator, m_IndexDepth, m_IndexSize, (void**)m_pIndex);
+    _ClearIndex(m_IndexDepth, m_IndexSize, (void**)m_pIndex);
     m_pIndex = NULL;
     m_IndexDepth = 0;
     m_DataSize = 0;
 }
 void* CFX_BaseSegmentedArray::Add()
 {
     if (m_DataSize % m_SegmentSize) {
         return GetAt(m_DataSize ++);
     }
-    void* pSegment = FX_Allocator_Alloc(m_pAllocator, FX_BYTE, m_UnitSize * m_SegmentSize);
+    void* pSegment = FX_Alloc(FX_BYTE, m_UnitSize * m_SegmentSize);
     if (!pSegment) {
         return NULL;
     }
     if (m_pIndex == NULL) {
         m_pIndex = pSegment;
         m_DataSize ++;
         return pSegment;
     }
     if (m_IndexDepth == 0) {
-        void** pIndex = (void**)FX_Allocator_Alloc(m_pAllocator, void*, m_IndexSize);
+        void** pIndex = (void**)FX_Alloc(void*, m_IndexSize);
         if (pIndex == NULL) {
-            FX_Allocator_Free(m_pAllocator, pSegment);
+            FX_Free(pSegment);
             return NULL;
         }
         FXSYS_memset32(pIndex, 0, sizeof(void*) * m_IndexSize);
         pIndex[0] = m_pIndex;
         pIndex[1] = pSegment;
         m_pIndex = pIndex;
         m_DataSize ++;
         m_IndexDepth ++;
         return pSegment;
     }
     int seg_index = m_DataSize / m_SegmentSize;
     if (seg_index % m_IndexSize) {
         void** pIndex = GetIndex(seg_index);
         pIndex[seg_index % m_IndexSize] = pSegment;
         m_DataSize ++;
         return pSegment;
     }
     int tree_size = 1;
     int i;
     for (i = 0; i < m_IndexDepth; i ++) {
         tree_size *= m_IndexSize;
     }
     if (m_DataSize == tree_size * m_SegmentSize) {
-        void** pIndex = (void**)FX_Allocator_Alloc(m_pAllocator, void*, m_IndexSize);
+        void** pIndex = (void**)FX_Alloc(void*, m_IndexSize);
         if (pIndex == NULL) {
-            FX_Allocator_Free(m_pAllocator, pSegment);
+            FX_Free(pSegment);
             return NULL;
         }
         FXSYS_memset32(pIndex, 0, sizeof(void*) * m_IndexSize);
         pIndex[0] = m_pIndex;
         m_pIndex = pIndex;
         m_IndexDepth ++;
     } else {
         tree_size /= m_IndexSize;
     }
     void** pSpot = (void**)m_pIndex;
     for (i = 1; i < m_IndexDepth; i ++) {
         if (pSpot[seg_index / tree_size] == NULL) {
-            pSpot[seg_index / tree_size] = (void*)FX_Allocator_Alloc(m_pAllocator, void*, m_IndexSize);
+            pSpot[seg_index / tree_size] = (void*)FX_Alloc(void*, m_IndexSize);
             if (pSpot[seg_index / tree_size] == NULL) {
                 break;
             }
             FXSYS_memset32(pSpot[seg_index / tree_size], 0, sizeof(void*) * m_IndexSize);
         }
         pSpot = (void**)pSpot[seg_index / tree_size];
         seg_index = seg_index % tree_size;
         tree_size /= m_IndexSize;
     }
     if (i < m_IndexDepth) {
-        FX_Allocator_Free(m_pAllocator, pSegment);
+        FX_Free(pSegment);
         RemoveAll();
         return NULL;
     }
     pSpot[seg_index % m_IndexSize] = pSegment;
     m_DataSize ++;
     return pSegment;
 }
 void** CFX_BaseSegmentedArray::GetIndex(int seg_index) const
 {
     ASSERT(m_IndexDepth != 0);
@@ skipping 76 matching lines @@
         for (int j = 0; j < m_UnitSize; j ++) {
             pDest[j] = pSrc[j];
         }
     }
     int new_segs = (m_DataSize - count + m_SegmentSize - 1) / m_SegmentSize;
     int old_segs = (m_DataSize + m_SegmentSize - 1) / m_SegmentSize;
     if (new_segs < old_segs) {
         if(m_IndexDepth) {
             for (i = new_segs; i < old_segs; i ++) {
                 void** pIndex = GetIndex(i);
-                FX_Allocator_Free(m_pAllocator, pIndex[i % m_IndexSize]);
+                FX_Free(pIndex[i % m_IndexSize]);
                 pIndex[i % m_IndexSize] = NULL;
             }
         } else {
-            FX_Allocator_Free(m_pAllocator, m_pIndex);
+            FX_Free(m_pIndex);
             m_pIndex = NULL;
         }
     }
     m_DataSize -= count;
 }