[SCM] PostGIS branch stable-3.3 updated. 3.3.5-7-g4db3ea514

[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.3 has been updated
       via  4db3ea514a07771bab69500ab2a330aa5a5829f4 (commit)
      from  198ddd7ff4de999dff946afd9d40d3cfa1bedfc9 (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 4db3ea514a07771bab69500ab2a330aa5a5829f4
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 1fac60a1a..c80e86181 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Proj 6.1+, and PostgreSQL 15+.
  - #5571, Memory over-allocation for narrow inputs (Paul Ramsey)
  - #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.3.5
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 01f362450..6f3c22fc1 100644
--- a/regress/core/tickets.sql
+++ b/regress/core/tickets.sql
@@ -1479,3 +1479,11 @@ SELECT '#5320', ST_SimplifyPreserveTopology('0106000020E864000001000000010300000
 
 DROP PROCEDURE IF EXISTS p_force_parellel_mode(text);
 SELECT '#5378', ST_SRID( ST_Buffer(ST_GeomFromText('POINT(-94 29.53)', 4269)::geography, 12)::geometry );
+
+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 ddd589ecf..71ebd17d4 100644
--- a/regress/core/tickets_expected
+++ b/regress/core/tickets_expected
@@ -456,3 +456,4 @@ ERROR:  Line has no points
 ERROR:  Geometry contains invalid coordinates
 ERROR:  Geometry contains invalid coordinates
 #5378|4269
+#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