From: Sandro Santilli <strk@keybit.net>
Date: Thu, 1 Dec 2005 13:49:56 +0000 (+0000)
Subject: Fixed short-allocation in lwcollection_clone()
X-Git-Tag: pgis_1_1_0~113
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c4f2a2c903730a8171ce2b74b6c02715cda7358;p=postgis

Fixed short-allocation in lwcollection_clone()


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

diff --git a/CHANGES b/CHANGES
index 8899f1b2f..88bd5bf7f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -36,6 +36,7 @@ PostGIS 1.0.6CVS
 	- Fixed geom_accum(NULL, NULL) segfault
 	- Initial support for postgresql 8.2
 	- Fixed segfault in addPoint()
+	- Fixed short-allocation in lwcollection_clone()
 
 PostGIS 1.0.5
 2005/11/25
diff --git a/lwgeom/lwcollection.c b/lwgeom/lwcollection.c
index ce8c4344b..5807b1049 100644
--- a/lwgeom/lwcollection.c
+++ b/lwgeom/lwcollection.c
@@ -220,18 +220,30 @@ lwcollection_compute_box2d_p(LWCOLLECTION *col, BOX2DFLOAT4 *box)
 	return 1;
 }
 
-// Clone LWCOLLECTION object. POINTARRAY are not copied.
+/*
+ * Clone LWCOLLECTION object. POINTARRAY are not copied.
+ * Bbox is cloned if present in input.
+ */
 LWCOLLECTION *
 lwcollection_clone(const LWCOLLECTION *g)
 {
 	uint32 i;
 	LWCOLLECTION *ret = lwalloc(sizeof(LWCOLLECTION));
 	memcpy(ret, g, sizeof(LWCOLLECTION));
-	for (i=0; i<g->ngeoms; i++)
+	if ( g->ngeoms > 0 )
 	{
-		ret->geoms[i] = lwgeom_clone(g->geoms[i]);
+		ret->geoms = lwalloc(sizeof(LWGEOM *)*g->ngeoms);
+		for (i=0; i<g->ngeoms; i++)
+		{
+			ret->geoms[i] = lwgeom_clone(g->geoms[i]);
+		}
+		if ( g->bbox ) ret->bbox = box2d_clone(g->bbox);
+	}
+	else
+	{
+		ret->bbox = NULL; // empty collection
+		ret->geoms = NULL;
 	}
-	if ( g->bbox ) ret->bbox = box2d_clone(g->bbox);
 	return ret;
 }