Re-land: Remove FX_Alloc() null checks now that it can't return NULL.

core/src/fxge/ge/fx_ge_path.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 "../../../../third_party/base/numerics/safe_math.h"
 #include "../../../include/fxcrt/fx_basic.h"
 #include "../../../include/fxge/fx_ge.h"
+
 CFX_ClipRgn::CFX_ClipRgn(int width, int height)
 {
     m_Type = RectI;
     m_Box.left = m_Box.top = 0;
     m_Box.right = width;
     m_Box.bottom = height;
 }
 CFX_ClipRgn::CFX_ClipRgn(const FX_RECT& rect)
 {
     m_Type = RectI;
@@ skipping 94 matching lines @@
 {
     m_PointCount = m_AllocCount = 0;
     m_pPoints = NULL;
 }
 CFX_PathData::~CFX_PathData()
 {
     if (m_pPoints) {
         FX_Free(m_pPoints);
     }
 }
-FX_BOOL CFX_PathData::SetPointCount(int nPoints)
+void CFX_PathData::SetPointCount(int nPoints)
 {
     m_PointCount = nPoints;
     if (m_AllocCount < nPoints) {
         if (m_pPoints) {
             FX_Free(m_pPoints);
             m_pPoints = NULL;
         }
         m_pPoints = FX_Alloc(FX_PATHPOINT, nPoints);
-        if (!m_pPoints) {
-            return FALSE;
-        }
         m_AllocCount = nPoints;
     }
-    return TRUE;
 }
-FX_BOOL CFX_PathData::AllocPointCount(int nPoints)
+void CFX_PathData::AllocPointCount(int nPoints)
 {
     if (m_AllocCount < nPoints) {
         FX_PATHPOINT* pNewBuf = FX_Alloc(FX_PATHPOINT, nPoints);
-        if (!pNewBuf) {
-            return FALSE;
-        }
         if (m_PointCount) {
             FXSYS_memcpy32(pNewBuf, m_pPoints, m_PointCount * sizeof(FX_PATHPOINT));
         }
         if (m_pPoints) {
             FX_Free(m_pPoints);
         }
         m_pPoints = pNewBuf;
         m_AllocCount = nPoints;
     }
-    return TRUE;
 }
 CFX_PathData::CFX_PathData(const CFX_PathData& src)
 {
-    m_pPoints = NULL;
     m_PointCount = m_AllocCount = src.m_PointCount;
     m_pPoints = FX_Alloc(FX_PATHPOINT, src.m_PointCount);
-    if (!m_pPoints) {
-        return;
-    }
     FXSYS_memcpy32(m_pPoints, src.m_pPoints, sizeof(FX_PATHPOINT) * m_PointCount);
 }
 void CFX_PathData::TrimPoints(int nPoints)
 {
     if (m_PointCount <= nPoints) {
         return;
     }
     SetPointCount(nPoints);
 }
-FX_BOOL CFX_PathData::AddPointCount(int addPoints)
+void CFX_PathData::AddPointCount(int addPoints)
 {
-    int new_count = m_PointCount + addPoints;
-    if (!AllocPointCount(new_count)) {
-        return FALSE;
-    }
+    pdfium::base::CheckedNumeric<int> safe_new_count = m_PointCount;
+    safe_new_count += addPoints;
+    int new_count = safe_new_count.ValueOrDie();
+    AllocPointCount(new_count);
     m_PointCount = new_count;
-    return TRUE;
 }
-FX_BOOL CFX_PathData::Append(const CFX_PathData* pSrc, const CFX_AffineMatrix* pMatrix)
+void CFX_PathData::Append(const CFX_PathData* pSrc, const CFX_AffineMatrix* pMatrix)
 {
     int old_count = m_PointCount;
-    if (!AddPointCount(pSrc->m_PointCount)) {
-        return FALSE;
+    AddPointCount(pSrc->m_PointCount);
+    FXSYS_memcpy32(m_pPoints + old_count, pSrc->m_pPoints, pSrc->m_PointCount * sizeof(FX_PATHPOINT));
+    if (pMatrix) {
+        for (int i = 0; i < pSrc->m_PointCount; i ++) {
+            pMatrix->Transform(m_pPoints[old_count + i].m_PointX, m_pPoints[old_count + i].m_PointY);
+        }
     }
-    FXSYS_memcpy32(m_pPoints + old_count, pSrc->m_pPoints, pSrc->m_PointCount * sizeof(FX_PATHPOINT));
-    if (pMatrix == NULL) {
-        return TRUE;
-    }
-    for (int i = 0; i < pSrc->m_PointCount; i ++) {
-        pMatrix->Transform(m_pPoints[old_count + i].m_PointX, m_pPoints[old_count + i].m_PointY);
-    }
-    return TRUE;
 }
 void CFX_PathData::SetPoint(int index, FX_FLOAT x, FX_FLOAT y, int flag)
 {
     ASSERT(index < m_PointCount);
     m_pPoints[index].m_PointX = x;
     m_pPoints[index].m_PointY = y;
     m_pPoints[index].m_Flag = flag;
 }
-FX_BOOL CFX_PathData::AppendRect(FX_FLOAT left, FX_FLOAT bottom, FX_FLOAT right, FX_FLOAT top)
+void CFX_PathData::AppendRect(FX_FLOAT left, FX_FLOAT bottom, FX_FLOAT right, FX_FLOAT top)
 {
     int old_count = m_PointCount;
-    if (!AddPointCount(5)) {
-        return FALSE;
-    }
+    AddPointCount(5);
     FX_PATHPOINT* pPoints = m_pPoints + old_count;
     pPoints[0].m_PointX = pPoints[1].m_PointX = pPoints[4].m_PointX = left;
     pPoints[2].m_PointX = pPoints[3].m_PointX = right;
     pPoints[0].m_PointY = pPoints[3].m_PointY = pPoints[4].m_PointY = bottom;
     pPoints[1].m_PointY = pPoints[2].m_PointY = top;
     pPoints[0].m_Flag = FXPT_MOVETO;
     pPoints[1].m_Flag = pPoints[2].m_Flag = pPoints[3].m_Flag = FXPT_LINETO;
     pPoints[4].m_Flag = FXPT_LINETO | FXPT_CLOSEFIGURE;
-    return TRUE;
 }
 CFX_FloatRect CFX_PathData::GetBoundingBox() const
 {
     CFX_FloatRect rect;
     if (m_PointCount) {
         rect.InitRect(m_pPoints[0].m_PointX, m_pPoints[0].m_PointY);
         for (int i = 1; i < m_PointCount; i ++) {
             rect.UpdateRect(m_pPoints[i].m_PointX, m_pPoints[i].m_PointY);
         }
     }
@@ skipping 353 matching lines @@
     }
     if (pRect) {
         pRect->left = x[0];
         pRect->right = x[2];
         pRect->bottom = y[0];
         pRect->top = y[2];
         pRect->Normalize();
     }
     return TRUE;
 }
-FX_BOOL CFX_PathData::Copy(const CFX_PathData &src)
+void CFX_PathData::Copy(const CFX_PathData &src)
 {
-    if (!SetPointCount(src.m_PointCount)) {
-        return FALSE;
-    }
+    SetPointCount(src.m_PointCount);
     FXSYS_memcpy32(m_pPoints, src.m_pPoints, sizeof(FX_PATHPOINT) * m_PointCount);
-    return TRUE;
 }
 CFX_GraphStateData::CFX_GraphStateData()
 {
     m_LineCap = LineCapButt;
     m_DashCount = 0;
     m_DashArray = NULL;
     m_DashPhase = 0;
     m_LineJoin = LineJoinMiter;
     m_MiterLimit = 10 * 1.0f;
     m_LineWidth = 1.0f;
@@ skipping 10 matching lines @@
     if (m_DashArray) {
         FX_Free(m_DashArray);
     }
     m_DashArray = NULL;
     m_DashPhase = src.m_DashPhase;
     m_LineJoin = src.m_LineJoin;
     m_MiterLimit = src.m_MiterLimit;
     m_LineWidth = src.m_LineWidth;
     if (m_DashCount) {
         m_DashArray = FX_Alloc(FX_FLOAT, m_DashCount);
-        if (!m_DashArray) {
-            return;
-        }
         FXSYS_memcpy32(m_DashArray, src.m_DashArray, m_DashCount * sizeof(FX_FLOAT));
     }
 }
 CFX_GraphStateData::~CFX_GraphStateData()
 {
     if (m_DashArray) {
         FX_Free(m_DashArray);
     }
 }
 void CFX_GraphStateData::SetDashCount(int count)
 {
     if (m_DashArray) {
         FX_Free(m_DashArray);
     }
     m_DashArray = NULL;
     m_DashCount = count;
     if (count == 0) {
         return;
     }
     m_DashArray = FX_Alloc(FX_FLOAT, count);
 }