Merge to XFA: Remove FX_Alloc() null checks now that it can't return NULL.

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"
 #include "../../../third_party/base/numerics/safe_math.h"
 
 CFX_BasicArray::CFX_BasicArray(int unit_size)
@@ skipping 21 matching lines @@
     }
 
     if (m_pData == NULL) {
         pdfium::base::CheckedNumeric<int> totalSize = nNewSize;
         totalSize *= m_nUnitSize;
         if (!totalSize.IsValid()) {
             m_nSize = m_nMaxSize = 0;
             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) {
             FXSYS_memset32(m_pData + m_nSize * m_nUnitSize, 0, (nNewSize - m_nSize) * m_nUnitSize);
         }
         m_nSize = nNewSize;
     } else {
         int nNewMax = nNewSize < m_nMaxSize ? m_nMaxSize : nNewSize;
         pdfium::base::CheckedNumeric<int> totalSize = nNewMax;
         totalSize *= m_nUnitSize;
@@ skipping 134 matching lines @@
         return GetAt(m_DataSize ++);
     }
     void* pSegment = FX_Alloc2D(FX_BYTE, m_UnitSize, m_SegmentSize);
     if (m_pIndex == NULL) {
         m_pIndex = pSegment;
         m_DataSize ++;
         return pSegment;
     }
     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;
         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_Alloc(void*, m_IndexSize);
-        if (pIndex == NULL) {
-            FX_Free(pSegment);
-            return NULL;
-        }
         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_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;
         tree_size /= m_IndexSize;
     }
     if (i < m_IndexDepth) {
         FX_Free(pSegment);
         RemoveAll();
         return NULL;
     }
@@ skipping 93 matching lines @@
                 FX_Free(pIndex[i % m_IndexSize]);
                 pIndex[i % m_IndexSize] = NULL;
             }
         } else {
             FX_Free(m_pIndex);
             m_pIndex = NULL;
         }
     }
     m_DataSize -= count;
 }