[SCM] PostGIS branch stable-3.4 updated. 3.4.1-31-gcb6fff2a2

[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.4 has been updated
       via  cb6fff2a2b5a4e21c15d62b29ddca2aaca813777 (commit)
      from  13d4f48d5cee630cc903558be5e7a38ec6879423 (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 cb6fff2a2b5a4e21c15d62b29ddca2aaca813777
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Wed Jan 10 11:48:49 2024 -0800

    Crash on collections with empty members, references #5646

diff --git a/NEWS b/NEWS
index bbf28ffeb..d911f4563 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ To take advantage of all SFCGAL featurs, SFCGAL 1.4.1+ is needed.
  - #5604, Handle distance between collections with empty elements (Paul Ramsey)
  - #5635, Handle NaN points in ST_Split (Regina Obe)
  - #5648, postgis_raster upgrade fails on PG16 (Ronan Dunklau)
+ - #5646, Crash on collections with empty members (Paul Ramsey)
 
 
 * Bug Fixes and Enhancments *
diff --git a/postgis/lwgeom_functions_analytic.c b/postgis/lwgeom_functions_analytic.c
index 6fa02c296..4e94f636a 100644
--- a/postgis/lwgeom_functions_analytic.c
+++ b/postgis/lwgeom_functions_analytic.c
@@ -947,6 +947,9 @@ int point_in_multipolygon_rtree(RTREE_NODE **root, int polyCount, int *ringCount
 	/* is the point inside any of the sub-polygons? */
 	for ( p = 0; p < polyCount; p++ )
 	{
+		/* Skip empty polygons */
+		if( ringCounts[p] == 0 ) continue;
+
 		in_ring = point_in_ring_rtree(root[i], &pt);
 		POSTGIS_DEBUGF(4, "point_in_multipolygon_rtree: exterior ring (%d), point_in_ring returned %d", p, in_ring);
 		if ( in_ring == -1 ) /* outside the exterior ring */

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

Summary of changes:
 NEWS                                | 1 +
 postgis/lwgeom_functions_analytic.c | 3 +++
 2 files changed, 4 insertions(+)


hooks/post-receive
-- 
PostGIS