Add safe FX_Alloc2D() macro

core/src/fxge/agg/agg23/fx_agg_path_storage.cpp

 
 //----------------------------------------------------------------------------
 // XYQ: 2006-01-22 Copied from AGG project.
 // TODO: This file uses intensive floating point operations, so it's NOT suitable
 // for platforms like Symbian OS. We need to change to FIX format.
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // Anti-Grain Geometry - Version 2.3
 // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
 //
@@ skipping 33 matching lines @@
     m_max_blocks(0),
     m_coord_blocks(0),
     m_cmd_blocks(0),
     m_iterator(0)
 {
 }
 void path_storage::allocate_block(unsigned nb)
 {
     if(nb >= m_max_blocks) {
         FX_FLOAT** new_coords =
-            FX_Alloc( FX_FLOAT*, (m_max_blocks + block_pool) * 2);
-        if (!new_coords) {
-            return;
-        }
+            FX_Alloc2D(FX_FLOAT*, m_max_blocks + block_pool, 2);
         unsigned char** new_cmds =
             (unsigned char**)(new_coords + m_max_blocks + block_pool);
         if(m_coord_blocks) {
             FXSYS_memcpy32(new_coords,
                            m_coord_blocks,
                            m_max_blocks * sizeof(FX_FLOAT*));
             FXSYS_memcpy32(new_cmds,
                            m_cmd_blocks,
                            m_max_blocks * sizeof(unsigned char*));
             FX_Free(m_coord_blocks);
@@ skipping 27 matching lines @@
 }
 void path_storage::end_poly()
 {
     if(m_total_vertices) {
         if(is_vertex(command(m_total_vertices - 1))) {
             add_vertex(0, 0, path_cmd_end_poly | path_flags_close);
         }
     }
 }
 }