MonetDB: sfcgal - Make code more robust against NULL pointers.

[Romulo Goncalves]

Changeset: 1e58b2bafed8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e58b2bafed8
Modified Files:
        geom/monetdb5/geom.c
Branch: sfcgal
Log Message:

Make code more robust against NULL pointers.


diffs (28 lines):

diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -2059,7 +2059,14 @@ geoGetType(char **res, int *info, int *f
 
 str GEOSGeomGetZ(const GEOSGeometry *geom, double *z) {
     const GEOSCoordSequence* gcs_new;
-    int type = GEOSGeomTypeId(geom)+1;
+    int type;
+    
+    if (!geom) {
+               *z = dbl_nil;
+               return createException(MAL, "geom.GEOSGeomGetZ", "Geometry is 
NULL");
+    }
+
+    type = GEOSGeomTypeId(geom)+1;
     
     if (type != wkbPoint_mdb) {
                *z = dbl_nil;
@@ -4751,7 +4758,7 @@ wkbAddPointIdx(wkb** out, wkb** lineWKB,
     }
 
     //Get Coordinates from Point
-       if (GEOSGeomGetX(point, &px) == -1 || GEOSGeomGetY(point, &py) == -1 || 
GEOSGeomGetZ(point, &pz) != MAL_SUCCEED) {
+       if (GEOSGeomGetX(point, &px) == -1 || GEOSGeomGetY(point, &py) == -1 || 
(lineDim == 3 && GEOSGeomGetZ(point, &pz) != MAL_SUCCEED)) {
                *out = NULL;
                throw(MAL, "geom.AddPoint", "Error in reading the points' 
coordinates");
     }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list