[postgis-tickets] [SCM] PostGIS branch stable-2.5 updated. 2.5.4-7-gf290e2f
git at osgeo.org
git at osgeo.org
Mon Mar 30 06:56:02 PDT 2020
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, stable-2.5 has been updated
via f290e2f63184382038eddbc9577801f98ceef4e6 (commit)
from 6a790d0a312edd7b57fc00ec0df62b45f70c5639 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f290e2f63184382038eddbc9577801f98ceef4e6
Author: Raúl Marín <git at rmr.ninja>
Date: Mon Mar 30 12:26:53 2020 +0200
Remove c99 loop initial declaration and fix NEWS
diff --git a/NEWS b/NEWS
index 1146e3a..cd7afde 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ PostGIS 2.5.5
* Bug fixes *
- - #4652, Fix several memory related bugs in ST_GeomFromGML
+ - #4652, Fix several memory related bugs in ST_GeomFromGML (Raúl Marín)
PostGIS 2.5.4
diff --git a/postgis/lwgeom_in_gml.c b/postgis/lwgeom_in_gml.c
index 5884de2..eed2881 100644
--- a/postgis/lwgeom_in_gml.c
+++ b/postgis/lwgeom_in_gml.c
@@ -1061,6 +1061,7 @@ static LWGEOM* parse_gml_curve(xmlNodePtr xnode, bool *hasz, int *root_srid)
* So we must aggregate all the segments into a single one and avoid
* to copy the redundant points
*/
+ size_t i;
size_t cp_point_size = sizeof(POINT3D); /* All internals are done with 3D */
size_t final_point_size = *hasz ? sizeof(POINT3D) : sizeof(POINT2D);
pa = ptarray_construct(1, 0, npoints - lss + 1);
@@ -1074,7 +1075,7 @@ static LWGEOM* parse_gml_curve(xmlNodePtr xnode, bool *hasz, int *root_srid)
* last point of the previous one, and copy all points except the
* first one (since it'd be repeated)
*/
- for (size_t i = 1; i < lss; i++)
+ for (i = 1; i < lss; i++)
{
if (memcmp(getPoint_internal(pa, npoints - 1), getPoint_internal(ppa[i], 0), final_point_size))
gml_lwpgerror("invalid GML representation", 41);
-----------------------------------------------------------------------
Summary of changes:
NEWS | 2 +-
postgis/lwgeom_in_gml.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list