Merge to XFA: Add safe FX_Alloc2D() macro

core/src/fxge/skia/fx_skia_device.cpp

Index: core/src/fxge/skia/fx_skia_device.cpp
diff --git a/core/src/fxge/skia/fx_skia_device.cpp b/core/src/fxge/skia/fx_skia_device.cpp
index 6c329eee4e772189841ae331b0cc5a96be148c69..00c981c9e86cffce05f9e8e6d81232c75e5c667c 100644
--- a/core/src/fxge/skia/fx_skia_device.cpp
+++ b/core/src/fxge/skia/fx_skia_device.cpp
@@ -210,7 +210,7 @@ static void SkRasterizeStroke(SkPaint& spaint, SkPath* dstPathData, SkPath& path
 		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];