Merge to XFA: Add safe FX_Alloc2D() macro

core/src/fxge/skia/fx_skia_device.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.
 
 #include "../../../include/fxge/fx_ge.h"
 //#define _SKIA_SUPPORT_
 #if defined(_SKIA_SUPPORT_)
 #include "../../../include/fxcodec/fx_codec.h"
 
 
@@ skipping 192 matching lines @@
                 stroker.setJoin(join);
                 stroker.setMiterLimit(pGraphState->m_MiterLimit);
                 stroker.setWidth(width);
                 stroker.setDoFill(FALSE);
                 stroker.strokePath(path_data, dstPathData);
                 SkMatrix smatrix; 
                 smatrix.setAll(pObject2Device->a, pObject2Device->c, pObject2Device->e, pObject2Device->b, pObject2Device->d, pObject2Device->f, 0, 0, 1);
                 dstPathData->transform(smatrix);
         } else {
                 int count = (pGraphState->m_DashCount+1)/2;
-                SkScalar* intervals = FX_Alloc(SkScalar, count* sizeof (SkScalar));
+                SkScalar* intervals = FX_Alloc2D(SkScalar, count, sizeof(SkScalar));
                 // Set dash pattern
                 for (int i = 0; i < count; i ++) {
                         FX_FIXFLOAT on = pGraphState->m_DashArray[i*2];
                         if (on <= 0.000001f) on = FIX8_ONE/10;
                         FX_FIXFLOAT off = i*2+1 == pGraphState->m_DashCount ? on :
                                         pGraphState->m_DashArray[i*2+1];
                         if (off < 0) off = 0;           
                         intervals[i*2]=on*scale;
                         intervals[i*2+1]=off*scale;
                 }
@@ skipping 298 matching lines @@
         CFX_SkiaDeviceDriver* pDriver =  FX_NEW CFX_SkiaDeviceDriver(pBitmap, dither_bits, FALSE, pOriDevice, FALSE);
         SetDeviceDriver(pDriver);
         return TRUE;
 }
 CFX_SkiaDevice::~CFX_SkiaDevice()
 {
         if (m_bOwnedBitmap && GetBitmap()) delete GetBitmap();
 }
 
 #endif