Fixed handling of empty collection in GEOS2POSTGIS converter

git-svn-id: http://svn.osgeo.org/postgis/trunk@1259 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/lwgeom/lwgeom_geos.c b/lwgeom/lwgeom_geos.c
index 11d83f88d1995bf322b628f0b53378157b61a425..8a3205dfc96d85b04d411f8f60b0fb52f79ba28d 100644 (file)
--- a/lwgeom/lwgeom_geos.c
+++ b/lwgeom/lwgeom_geos.c
@@ -2129,7 +2129,7 @@ LWCOLLECTION *
 lwcollection_from_geometry(Geometry *geom, char want3d)
 {
        uint32 ngeoms;
-       LWGEOM **geoms;
+       LWGEOM **geoms = NULL;
        LWCOLLECTION *ret;
        int type = GEOSGeometryTypeId(geom) ;
        int SRID = GEOSGetSRID(geom);
@@ -2142,7 +2142,7 @@ lwcollection_from_geometry(Geometry *geom, char want3d)
                lwgeom_typename(type), ngeoms);
 #endif
 
-       geoms = lwalloc(sizeof(LWGEOM *)*ngeoms);
+       if ( ngeoms ) geoms = lwalloc(sizeof(LWGEOM *)*ngeoms);
 
        for (i=0; i<ngeoms; i++)
        {
@@ -2180,7 +2180,6 @@ lwgeom_from_geometry(Geometry *geom, char want3d)
 #ifdef DEBUG_GEOS2POSTGIS
        lwnotice("lwgeom_from_geometry: it's a %s", lwgeom_typename(type));
 #endif
-
        switch (type)
        {
                /* From slower to faster.. compensation rule :) */