[postgis-commits] svn - r3519 - in trunk: liblwgeom loader

[postgis-commits at postgis.refractions.net]

Author: pramsey
Date: 2009-01-12 11:29:57 -0800 (Mon, 12 Jan 2009)
New Revision: 3519

Modified:
   trunk/liblwgeom/lwcollection.c
   trunk/liblwgeom/lwmpoint.c
   trunk/liblwgeom/lwmpoly.c
   trunk/loader/shp2pgsql.c
Log:
Remove double-free problem from loader in presence of new deep-freeing lwfree calls.


Modified: trunk/liblwgeom/lwcollection.c
===================================================================
--- trunk/liblwgeom/lwcollection.c	2009-01-12 14:38:09 UTC (rev 3518)
+++ trunk/liblwgeom/lwcollection.c	2009-01-12 19:29:57 UTC (rev 3519)
@@ -485,4 +485,5 @@
 	}
 	lwfree(col);
 	
-};
\ No newline at end of file
+};
+

Modified: trunk/liblwgeom/lwmpoint.c
===================================================================
--- trunk/liblwgeom/lwmpoint.c	2009-01-12 14:38:09 UTC (rev 3518)
+++ trunk/liblwgeom/lwmpoint.c	2009-01-12 19:29:57 UTC (rev 3519)
@@ -134,4 +134,5 @@
 	}
 	lwfree(mpt);
 	
-};
\ No newline at end of file
+};
+

Modified: trunk/liblwgeom/lwmpoly.c
===================================================================
--- trunk/liblwgeom/lwmpoly.c	2009-01-12 14:38:09 UTC (rev 3518)
+++ trunk/liblwgeom/lwmpoly.c	2009-01-12 19:29:57 UTC (rev 3519)
@@ -137,4 +137,5 @@
 	}
 	lwfree(mpoly);
 	
-};
\ No newline at end of file
+};
+

Modified: trunk/loader/shp2pgsql.c
===================================================================
--- trunk/loader/shp2pgsql.c	2009-01-12 14:38:09 UTC (rev 3518)
+++ trunk/loader/shp2pgsql.c	2009-01-12 19:29:57 UTC (rev 3519)
@@ -806,7 +806,6 @@
 InsertLineString()
 {
 	LWCOLLECTION *lwcollection;
-	BOX2DFLOAT4 bbox;
 
 	LWGEOM **lwmultilinestrings;
 	uchar *serialized_lwgeom;
@@ -866,13 +865,13 @@
 		}
 	
 		/* Generate the LWLINE */
-		lwmultilinestrings[u] = lwline_as_lwgeom(lwline_construct(sr_id, &bbox, dpas[u]->pa));
+		lwmultilinestrings[u] = lwline_as_lwgeom(lwline_construct(sr_id, NULL, dpas[u]->pa));
 	}
 
 	/* If using MULTILINESTRINGs then generate the serialized collection, otherwise just a single LINESTRING */
 	if (simple_geometries == 0)
 	{
-		lwcollection = lwcollection_construct(MULTILINETYPE, sr_id, &bbox, obj->nParts, lwmultilinestrings);
+		lwcollection = lwcollection_construct(MULTILINETYPE, sr_id, NULL, obj->nParts, lwmultilinestrings);
 		serialized_lwgeom = lwgeom_serialize(lwcollection_as_lwgeom(lwcollection));
 	}
 	else
@@ -1069,7 +1068,6 @@
 	int u;	
 
 	LWCOLLECTION *lwcollection = NULL;
-	BOX2DFLOAT4 bbox;
 
 	LWGEOM **lwpolygons;
 	uchar *serialized_lwgeom;
@@ -1157,7 +1155,7 @@
 		}
 
 		/* Generate the LWGEOM */
-		lwpoly = lwpoly_construct(sr_id, &bbox, ring_total, pas[pi]);	
+		lwpoly = lwpoly_construct(sr_id, NULL, ring_total, pas[pi]);	
 		lwpolygons[pi] = lwpoly_as_lwgeom(lwpoly);
 	}
 
@@ -1166,7 +1164,7 @@
 	/* If using MULTIPOLYGONS then generate the serialized collection, otherwise just a single POLYGON */
 	if (simple_geometries == 0)
 	{
-		lwcollection = lwcollection_construct(MULTIPOLYGONTYPE, sr_id, &bbox, polygon_total, lwpolygons);
+		lwcollection = lwcollection_construct(MULTIPOLYGONTYPE, sr_id, NULL, polygon_total, lwpolygons);
 		serialized_lwgeom = lwgeom_serialize(lwcollection_as_lwgeom(lwcollection));
 	}
 	else
@@ -1209,7 +1207,6 @@
 InsertPoint(void)
 {
 	LWCOLLECTION *lwcollection;
-	BOX2DFLOAT4 bbox;
 
 	LWGEOM **lwmultipoints;
 	uchar *serialized_lwgeom;
@@ -1257,7 +1254,7 @@
 	rather than a POINT */
 	if (obj->nVertices > 1)
 	{
-		lwcollection = lwcollection_construct(MULTIPOINTTYPE, sr_id, &bbox, obj->nVertices, lwmultipoints);
+		lwcollection = lwcollection_construct(MULTIPOINTTYPE, sr_id, NULL, obj->nVertices, lwmultipoints);
 		serialized_lwgeom = lwgeom_serialize(lwcollection_as_lwgeom(lwcollection));
 	}
 	else