Merge to XFA: Add safe FX_Alloc2D() macro

core/src/fpdfapi/fpdf_edit/fpdf_edit_image.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_module.h"
 #include "../../../include/fpdfapi/fpdf_page.h"
 #include "../../../include/fxcodec/fx_codec.h"
 #include "../../../include/fpdfapi/fpdf_render.h"
@@ skipping 144 matching lines @@
             opType = 0;
         }
     } else if (bpp == 8) {
         FX_INT32 iPalette = pBitmap->GetPaletteSize();
         if (iPalette > 0) {
             CPDF_Array* pCS = new CPDF_Array;
             m_pDocument->AddIndirectObject(pCS);
             pCS->AddName(FX_BSTRC("Indexed"));
             pCS->AddName(FX_BSTRC("DeviceRGB"));
             pCS->AddInteger(iPalette - 1);
-            FX_LPBYTE pColorTable = FX_Alloc(FX_BYTE, iPalette * 3);
+            FX_LPBYTE pColorTable = FX_Alloc2D(FX_BYTE, iPalette, 3);
             FX_LPBYTE ptr = pColorTable;
             for (FX_INT32 i = 0; i < iPalette; i ++) {
                 FX_DWORD argb = pBitmap->GetPaletteArgb(i);
                 ptr[0] = (FX_BYTE)(argb >> 16);
                 ptr[1] = (FX_BYTE)(argb >> 8);
                 ptr[2] = (FX_BYTE)argb;
                 ptr += 3;
             }
             CPDF_Stream *pCTS = CPDF_Stream::Create(pColorTable, iPalette * 3, CPDF_Dictionary::Create());
             m_pDocument->AddIndirectObject(pCTS);
@@ skipping 189 matching lines @@
     m_Width = BitmapWidth;
     m_Height = BitmapHeight;
     if (dest_buf) {
         FX_Free(dest_buf);
     }
 }
 void CPDF_Image::ResetCache(CPDF_Page* pPage, const CFX_DIBitmap* pBitmap)
 {
     pPage->GetRenderCache()->ResetBitmap(m_pStream, pBitmap);
 }