[postgis-tickets] [SCM] PostGIS branch stable-3.2 updated. 3.2.0-25-g89ada38b1
git at osgeo.org
git at osgeo.org
Thu Jan 20 18:06:43 PST 2022
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-3.2 has been updated
via 89ada38b166ca52d96db2c9a6621e7c06392936f (commit)
via 63d59f0641f9f48a377f7a60a8ed93277c744dab (commit)
via a05bf507e63146d75d337e84686e6a0915eb5b51 (commit)
from 1b30f5857069e84c7d6ce3cc53f627078fb2b6ff (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 89ada38b166ca52d96db2c9a6621e7c06392936f
Merge: 63d59f064 1b30f5857
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Thu Jan 20 18:06:35 2022 -0800
Merge branch 'stable-3.2' of https://git.osgeo.org/gitea/postgis/postgis into stable-3.2
diff --cc NEWS
index 449b439a1,2956eb0f0..59154ec06
--- a/NEWS
+++ b/NEWS
@@@ -4,7 -4,8 +4,9 @@@ YYYY/MM/D
* Bug Fixes *
- #5033, #5035, allow upgrades in presence of views using deprecated
functions (Sandro Santilli)
+ - #5046, Fix upgrades in absence of old library (Sandro Santilli)
+ - #5063, Fix ST_Srid(TopoGeometry) against a set (Sandro Santilli)
+ - #3056, spurious notice on ST_StartPoint(empty) (Paul Ramsey)
PostGIS 3.2.0 (Olivier Courtin Edition)
2021/12/17
commit 63d59f0641f9f48a377f7a60a8ed93277c744dab
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Thu Jan 20 18:06:04 2022 -0800
News entry for #5036
diff --git a/NEWS b/NEWS
index 75332c299..449b439a1 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ YYYY/MM/DD
* Bug Fixes *
- #5033, #5035, allow upgrades in presence of views using deprecated
functions (Sandro Santilli)
+ - #3056, spurious notice on ST_StartPoint(empty) (Paul Ramsey)
PostGIS 3.2.0 (Olivier Courtin Edition)
2021/12/17
commit a05bf507e63146d75d337e84686e6a0915eb5b51
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Thu Jan 20 17:51:25 2022 -0800
Test for empty before reading start point. Closes #5036
diff --git a/liblwgeom/lwgeom.c b/liblwgeom/lwgeom.c
index 95f94f1fb..b5d022d1c 100644
--- a/liblwgeom/lwgeom.c
+++ b/liblwgeom/lwgeom.c
@@ -2117,7 +2117,7 @@ lwgeom_construct_empty(uint8_t type, int32_t srid, char hasz, char hasm)
int
lwgeom_startpoint(const LWGEOM *lwgeom, POINT4D *pt)
{
- if ( ! lwgeom )
+ if ( ! lwgeom || lwgeom_is_empty(lwgeom) )
return LW_FAILURE;
switch( lwgeom->type )
diff --git a/postgis/lwgeom_ogc.c b/postgis/lwgeom_ogc.c
index 5830345c3..6ba0c1ac7 100644
--- a/postgis/lwgeom_ogc.c
+++ b/postgis/lwgeom_ogc.c
@@ -697,14 +697,13 @@ Datum LWGEOM_startpoint_linestring(PG_FUNCTION_ARGS)
PG_RETURN_NULL();
}
- PG_FREE_IF_COPY(geom, 0);
-
lwpoint = (LWGEOM *)lwpoint_make(lwgeom->srid, lwgeom_has_z(lwgeom), lwgeom_has_m(lwgeom), &pt);
ret = geometry_serialize(lwpoint);
lwgeom_free(lwgeom);
lwgeom_free(lwpoint);
+ PG_FREE_IF_COPY(geom, 0);
PG_RETURN_POINTER(ret);
}
-----------------------------------------------------------------------
Summary of changes:
NEWS | 1 +
liblwgeom/lwgeom.c | 2 +-
postgis/lwgeom_ogc.c | 3 +--
3 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list