Merge to XFA: Add safe FX_Alloc2D() macro

core/src/fpdftext/fpdf_text.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/fpdfapi/fpdf_page.h"
 #include "../../include/fpdfapi/fpdf_pageobj.h"
 #include "../../include/fpdftext/fpdf_text.h"
 #include "txtproc.h"
@@ skipping 39 matching lines @@
     }
 }
 void CTextPage::ProcessObject(CPDF_PageObject* pObject)
 {
     if (pObject->m_Type != PDFPAGE_TEXT) {
         return;
     }
     CPDF_TextObject* pText = (CPDF_TextObject*)pObject;
     CPDF_Font* pFont = pText->m_TextState.GetFont();
     int count = pText->CountItems();
-    FX_FLOAT* pPosArray = FX_Alloc(FX_FLOAT, count * 2);
-    if (pPosArray) {
-        pText->CalcCharPos(pPosArray);
-    }
+    FX_FLOAT* pPosArray = FX_Alloc2D(FX_FLOAT, count, 2);
+    pText->CalcCharPos(pPosArray);
+
     FX_FLOAT fontsize_h = pText->m_TextState.GetFontSizeH();
     FX_FLOAT fontsize_v = pText->m_TextState.GetFontSizeV();
     FX_DWORD space_charcode = pFont->CharCodeFromUnicode(' ');
     FX_FLOAT spacew = 0;
     if (space_charcode != -1) {
         spacew = fontsize_h * pFont->GetCharWidthF(space_charcode) / 1000;
     }
     if (spacew == 0) {
         spacew = fontsize_h / 4;
     }
@@ skipping 706 matching lines @@
 {
     buffer.EstimateSize(0, 10240);
     CPDF_Page page;
     page.Load(pDoc, pPage);
     CPDF_ParseOptions options;
     options.m_bTextOnly = TRUE;
     options.m_bSeparateForm = FALSE;
     page.ParseContent(&options);
     _PDF_GetTextStream_Unicode(buffer, &page, TRUE, NULL);
 }