Fixed compiler warnings, handled exceptions in POSTGIS2GEOS conversions

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

diff --git a/lwgeom/lwgeom_geos_c.c b/lwgeom/lwgeom_geos_c.c
index f923e6e672a35ec3bac2897d23307f6b79e9873b..df2c9e79a6c4a2918be0e527db516a39bcdbca05 100644 (file)
--- a/lwgeom/lwgeom_geos_c.c
+++ b/lwgeom/lwgeom_geos_c.c
@@ -99,7 +99,7 @@ Datum unite_garray(PG_FUNCTION_ARGS)
        int is3d = 0;
        int nelems, i;
        PG_LWGEOM *result, *pgis_geom;
-       GEOSGeom g1, g2, *geos_result=NULL;
+       GEOSGeom g1, g2, geos_result=NULL;
        int SRID=-1;
        size_t offset;
 #ifdef PGIS_DEBUG
@@ -2215,6 +2215,9 @@ POSTGIS2GEOS(PG_LWGEOM *pglwgeom)
        wkb = pglwgeom_to_ewkb(pglwgeom, getMachineEndian(), &size);
        geom = GEOSGeomFromWKB_buf(wkb, size);
        lwfree(wkb);
+       if ( ! geom ) {
+               lwerror("POSTGIS2GEOS conversion failed");
+       }
 
        wkb = GEOSGeomToWKT(geom);
 #ifdef PGIS_DEBUG_CONVERTER