Merge to XFA: Add safe FX_Alloc2D() macro

core/src/fxcodec/codec/fx_codec_jpeg.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/fxcodec/fx_codec.h"
 #include "../../../include/fxge/fx_dib.h"
 #include "codec_int.h"
 extern "C" {
@@ skipping 197 matching lines @@
     cinfo.input_components = nComponents;
     if (nComponents == 1) {
         cinfo.in_color_space = JCS_GRAYSCALE;
     } else if (nComponents == 3) {
         cinfo.in_color_space = JCS_RGB;
     } else {
         cinfo.in_color_space = JCS_CMYK;
     }
     FX_LPBYTE line_buf = NULL;
     if (nComponents > 1) {
-        line_buf = FX_Alloc(FX_BYTE, width * nComponents);
-        if (line_buf == NULL) {
-            return;
-        }
+        line_buf = FX_Alloc2D(FX_BYTE, width, nComponents);
     }
     jpeg_set_defaults(&cinfo);
     if(quality != 75) {
         jpeg_set_quality(&cinfo, quality, TRUE);
     }
     jpeg_start_compress(&cinfo, TRUE);
     _JpegEmbedIccProfile(&cinfo, icc_buf, icc_length);
     JSAMPROW row_pointer[1];
     JDIMENSION row;
     while (cinfo.next_scanline < cinfo.image_height) {
@@ skipping 503 matching lines @@
         return m_pExtProvider->GetAvailInput(pContext, avail_buf_ptr);
     }
     if(avail_buf_ptr != NULL) {
         *avail_buf_ptr = NULL;
         if(((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer > 0) {
             *avail_buf_ptr = (FX_LPBYTE)((FXJPEG_Context*)pContext)->m_SrcMgr.next_input_byte;
         }
     }
     return (FX_DWORD)((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer;
 }