[SCM] PostGIS branch stable-3.1 updated. 3.1.10-7-gff5b8ac87

[git at osgeo.org]

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.1 has been updated
       via  ff5b8ac877ea174976e14403abeb9fcffcc0d9b4 (commit)
      from  9bd3a07dee95543b714fa15f2f7289492f938fe9 (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 ff5b8ac877ea174976e14403abeb9fcffcc0d9b4
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Nov 30 15:12:02 2023 -0800

    Handling of EMPTY components in PiP check, #5627

diff --git a/NEWS b/NEWS
index 99ef26ccd..e6072c874 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ xxxx/xx/xx
 * Bug Fixes *
  - #5610, Regression fix: Allow Nan and infinity again
           in ST_SetPoint (Regina Obe)
+ - #5627, Handling of EMPTY components in PiP check (Paul Ramsey)
 
 PostGIS 3.1.10
 2023/11/19
diff --git a/postgis/lwgeom_functions_analytic.c b/postgis/lwgeom_functions_analytic.c
index 24fc11794..6fa02c296 100644
--- a/postgis/lwgeom_functions_analytic.c
+++ b/postgis/lwgeom_functions_analytic.c
@@ -936,6 +936,9 @@ int point_in_multipolygon_rtree(RTREE_NODE **root, int polyCount, int *ringCount
 
 	POSTGIS_DEBUGF(2, "point_in_multipolygon_rtree called for %p %d %p.", root, polyCount, point);
 
+	/* empty is not within anything */
+	if (lwpoint_is_empty(point)) return -1;
+
 	getPoint2d_p(point->point, 0, &pt);
 	/* assume bbox short-circuit has already been attempted */
 
@@ -1045,6 +1048,9 @@ int point_in_multipolygon(LWMPOLY *mpolygon, LWPOINT *point)
 
 	POSTGIS_DEBUG(2, "point_in_polygon called.");
 
+	/* empty is not within anything */
+	if (lwpoint_is_empty(point)) return -1;
+
 	getPoint2d_p(point->point, 0, &pt);
 	/* assume bbox short-circuit has already been attempted */
 
diff --git a/regress/core/tickets.sql b/regress/core/tickets.sql
index 1660677e8..e8a30e119 100644
--- a/regress/core/tickets.sql
+++ b/regress/core/tickets.sql
@@ -1451,3 +1451,11 @@ SET client_min_messages TO NOTICE;
 SELECT '#5315', ST_Buffer('0106000020E86400000100000001030000000100000005000000000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F'::geometry, 1);
 
 SELECT '#5320', ST_SimplifyPreserveTopology('0106000020E86400000100000001030000000100000005000000000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F'::geometry, 1);
+
+SELECT '#5627' AS ticket, bool_and(ST_Intersects(
+    'MULTIPOINT(EMPTY,(-378 574))'::geometry,
+    geom))
+FROM (VALUES
+    ('MULTIPOLYGON(((-357 477,-392 574,-378 574,-357 477)))'::geometry),
+    ('MULTIPOLYGON(((-357 477,-392 574,-378 574,-357 477)))'::geometry))
+    AS geoms(geom);
diff --git a/regress/core/tickets_expected b/regress/core/tickets_expected
index af2604dd6..d9409b737 100644
--- a/regress/core/tickets_expected
+++ b/regress/core/tickets_expected
@@ -461,3 +461,4 @@ ERROR:  Line has no points
 #5139|1000000
 ERROR:  Geometry contains invalid coordinates
 ERROR:  Geometry contains invalid coordinates
+#5627|t

-----------------------------------------------------------------------

Summary of changes:
 NEWS                                | 1 +
 postgis/lwgeom_functions_analytic.c | 6 ++++++
 regress/core/tickets.sql            | 8 ++++++++
 regress/core/tickets_expected       | 1 +
 4 files changed, 16 insertions(+)


hooks/post-receive
-- 
PostGIS