Changeset: 95191ed51c90 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=95191ed51c90
Modified Files:
geom/monetdb5/geom.c
Branch: Jun2016
Log Message:
Call GDKfree on object that was allocated by GDKmalloc.
diffs (48 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -246,9 +246,9 @@ transformPolygon(GEOSGeometry **transfor
/* iterate over the interiorRing and transform each one of them */
transformedInteriorRingGeometries = GDKmalloc(numInteriorRings *
sizeof(GEOSGeometry *));
for (i = 0; i < numInteriorRings; i++) {
- ret =
transformLinearRing(&(transformedInteriorRingGeometries[i]),
GEOSGetInteriorRingN(geosGeometry, i), proj4_src, proj4_dst);
+ ret =
transformLinearRing(&transformedInteriorRingGeometries[i],
GEOSGetInteriorRingN(geosGeometry, i), proj4_src, proj4_dst);
if (ret != MAL_SUCCEED) {
- GDKfree(*transformedInteriorRingGeometries);
+ GDKfree(transformedInteriorRingGeometries);
*transformedGeometry = NULL;
return ret;
}
@@ -602,8 +602,8 @@ forceDimPolygon(GEOSGeometry **outGeomet
/* iterate over the interiorRing and translate each one of them */
transformedInteriorRingGeometries = GDKmalloc(numInteriorRings *
sizeof(GEOSGeometry *));
for (i = 0; i < numInteriorRings; i++) {
- if ((ret =
forceDimLinearRing(&(transformedInteriorRingGeometries[i]),
GEOSGetInteriorRingN(geosGeometry, i), dim)) != MAL_SUCCEED) {
- GDKfree(*transformedInteriorRingGeometries);
+ if ((ret =
forceDimLinearRing(&transformedInteriorRingGeometries[i],
GEOSGetInteriorRingN(geosGeometry, i), dim)) != MAL_SUCCEED) {
+ GDKfree(transformedInteriorRingGeometries);
*outGeometry = NULL;
return ret;
}
@@ -911,8 +911,8 @@ segmentizePolygon(GEOSGeometry **outGeom
//iterate over the interiorRing and segmentize each one of them
transformedInteriorRingGeometries = GDKmalloc(numInteriorRings *
sizeof(GEOSGeometry *));
for (i = 0; i < numInteriorRings; i++) {
- if ((err =
segmentizeLineString(&(transformedInteriorRingGeometries[i]),
GEOSGetInteriorRingN(geosGeometry, i), sz, 1)) != MAL_SUCCEED) {
- GDKfree(*transformedInteriorRingGeometries);
+ if ((err =
segmentizeLineString(&transformedInteriorRingGeometries[i],
GEOSGetInteriorRingN(geosGeometry, i), sz, 1)) != MAL_SUCCEED) {
+ GDKfree(transformedInteriorRingGeometries);
*outGeometry = NULL;
return err;
}
@@ -1178,8 +1178,8 @@ translatePolygon(GEOSGeometry **outGeome
/* iterate over the interiorRing and translate each one of them */
transformedInteriorRingGeometries = GDKmalloc(numInteriorRings *
sizeof(GEOSGeometry *));
for (i = 0; i < numInteriorRings; i++) {
- if ((err =
translateLinearRing(&(transformedInteriorRingGeometries[i]),
GEOSGetInteriorRingN(geosGeometry, i), dx, dy, dz)) != MAL_SUCCEED) {
- GDKfree(*transformedInteriorRingGeometries);
+ if ((err =
translateLinearRing(&transformedInteriorRingGeometries[i],
GEOSGetInteriorRingN(geosGeometry, i), dx, dy, dz)) != MAL_SUCCEED) {
+ GDKfree(transformedInteriorRingGeometries);
*outGeometry = NULL;
return err;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
