Changeset 5210

Timestamp:

Feb 6, 2010, 2:49:00 AM (15 years ago)

Author:

colivier

Message:

Fix non NULL terminated string in ST_AsSVG with GEOMETRYCOLLECTION EMPTY, cf #409 reported by sdikiy. Add related unit test

Location:

branches/1.5

Files:

• postgis/lwgeom_svg.c (modified) (2 diffs)
• regress/svg.sql (modified) (1 diff)
• regress/svg_expected (modified) (1 diff)

branches/1.5/postgis/lwgeom_svg.c

@@ -473 +473 @@
                 size += sizeof(";") * --i;
 
+        if (size == 0) size++; /* EMPTY GEOMETRYCOLLECTION */
+
         return size;
 }
@@ -483 +485 @@
         LWGEOM_INSPECTED *subinsp;
         uchar *subgeom;
+
+        /* EMPTY GEOMETRYCOLLECTION */
+        if (insp->ngeometries == 0) *ptr = '\0';
 
         for (i=0; i<insp->ngeometries; i++)

branches/1.5/regress/svg.sql

@@ -148 +148 @@
 SELECT '3D_04', ST_AsSVG(GeomFromEWKT('SRID=4326;POLYGON((1 1 1, 2 2 2, 3 3 3, 4 4 4, 5 5 5, 5 0 0, 1 1 1))'), 0);
 
+
+-- EMPTY GEOMETRYCOLLECTION  #409
+SELECT '#409', ST_AsSVG(GeomFromEWKT('GEOMETRYCOLLECTION EMPTY'));
+
 --
 -- Delete inserted spatial data

branches/1.5/regress/svg_expected

@@ -42 +42 @@
 3D_03|M 1 -1 L 2 -2 3 -3 4 -4
 3D_04|M 1 -1 L 2 -2 3 -3 4 -4 5 -5 5 0 Z
+#409|