MonetDB: Aug2011 - Use GEOSFree instead of free.

[Sjoerd Mullender]

Changeset: e331374aaeea for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e331374aaeea
Modified Files:
        geom/monetdb5/geom.mx
Branch: Aug2011
Log Message:

Use GEOSFree instead of free.
This makes sure that we use the free that comes with the malloc that
the geos library uses.


diffs (30 lines):

diff --git a/geom/monetdb5/geom.mx b/geom/monetdb5/geom.mx
--- a/geom/monetdb5/geom.mx
+++ b/geom/monetdb5/geom.mx
@@ -569,7 +569,7 @@ wkbTOSTR(char **dst,                /* INOUT: dst char
 
        if (wkt) {
                snprintf(*dst, *len, "\"%s\"", wkt);
-               free(wkt);
+               GEOSFree(wkt);
        } else {
                strcpy(*dst, "nil");
        }
@@ -619,7 +619,7 @@ wkbFROMSTR(char *src,               /* IN: to-be-pars
                assert(wkbLen <= GDK_int_max);
                (*atom)->len = (int) wkbLen;
                memcpy(&(*atom)->data, wkbSer, wkbLen);
-               free(wkbSer);
+               GEOSFree(wkbSer);
        }
        wkbLen = strlen(src);
        assert(wkbLen <= GDK_int_max);
@@ -933,7 +933,7 @@ geos2wkb(GEOSGeom geosGeometry)
                assert(wkbLen <= GDK_int_max);
                atom->len = (int) wkbLen;
                memcpy(&atom->data, w, wkbLen);
-               free(w);
+               GEOSFree(w);
        }
        return atom;
 }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list