diff options
Diffstat (limited to 'core/src/fxcrt/fx_basic_array.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_basic_array.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/core/src/fxcrt/fx_basic_array.cpp b/core/src/fxcrt/fx_basic_array.cpp index 43a5417c00..5a2a2e54a1 100644 --- a/core/src/fxcrt/fx_basic_array.cpp +++ b/core/src/fxcrt/fx_basic_array.cpp @@ -39,6 +39,10 @@ FX_BOOL CFX_BasicArray::SetSize(int nNewSize) return FALSE; } m_pData = FX_Alloc(FX_BYTE, totalSize.ValueOrDie()); + if (!m_pData) { + m_nSize = m_nMaxSize = 0; + return FALSE; + } m_nSize = m_nMaxSize = nNewSize; } else if (nNewSize <= m_nMaxSize) { if (nNewSize > m_nSize) { @@ -193,6 +197,10 @@ void* CFX_BaseSegmentedArray::Add() } if (m_IndexDepth == 0) { void** pIndex = (void**)FX_Alloc(void*, m_IndexSize); + if (pIndex == NULL) { + FX_Free(pSegment); + return NULL; + } pIndex[0] = m_pIndex; pIndex[1] = pSegment; m_pIndex = pIndex; @@ -214,6 +222,10 @@ void* CFX_BaseSegmentedArray::Add() } if (m_DataSize == tree_size * m_SegmentSize) { void** pIndex = (void**)FX_Alloc(void*, m_IndexSize); + if (pIndex == NULL) { + FX_Free(pSegment); + return NULL; + } pIndex[0] = m_pIndex; m_pIndex = pIndex; m_IndexDepth ++; @@ -224,6 +236,9 @@ void* CFX_BaseSegmentedArray::Add() for (i = 1; i < m_IndexDepth; i ++) { if (pSpot[seg_index / tree_size] == NULL) { pSpot[seg_index / tree_size] = (void*)FX_Alloc(void*, m_IndexSize); + if (pSpot[seg_index / tree_size] == NULL) { + break; + } } pSpot = (void**)pSpot[seg_index / tree_size]; seg_index = seg_index % tree_size; |