[SCM] PostGIS branch stable-3.3 updated. 3.3.5-24-g21eecd6a6

[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  21eecd6a63b905e86a7db958992c0bdc7ddf9b17 (commit)
      from  d5cdeb9cf791b5a52a7df376d5c70fa3ef47bddd (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 21eecd6a63b905e86a7db958992c0bdc7ddf9b17
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Jan 11 13:51:02 2024 -0800

    Handle empty collection components in 3d distance, references #5580

diff --git a/NEWS b/NEWS
index c04569b78..dc975a4dc 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@ Proj 6.1+, and PostgreSQL 15+.
  - #5648, postgis_raster upgrade fails on PG16 (Ronan Dunklau)
  - Logic error in ST_Covers(geography) (Paul Ramsey)
  - #5646, Crash on collections with empty members (Paul Ramsey)
+ - #5580, Handle empty collection components in 3d distance (Paul Ramsey)
 
 
 PostGIS 3.3.5
diff --git a/liblwgeom/measures3d.c b/liblwgeom/measures3d.c
index 30b71f0d6..6f2996be5 100644
--- a/liblwgeom/measures3d.c
+++ b/liblwgeom/measures3d.c
@@ -515,7 +515,7 @@ lw_dist3d_recursive(const LWGEOM *lwg1, const LWGEOM *lwg2, DISTPTS3D *dl)
 			g1 = (LWGEOM *)lwg1;
 
 		if (lwgeom_is_empty(g1))
-			return LW_TRUE;
+			continue;
 
 		if (lwgeom_is_collection(g1))
 		{
@@ -531,6 +531,9 @@ lw_dist3d_recursive(const LWGEOM *lwg1, const LWGEOM *lwg2, DISTPTS3D *dl)
 			else
 				g2 = (LWGEOM *)lwg2;
 
+			if (lwgeom_is_empty(g2))
+				continue;
+
 			if (lwgeom_is_collection(g2))
 			{
 				LWDEBUG(3, "Found collection inside second geometry collection, recursing");

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

Summary of changes:
 NEWS                   | 1 +
 liblwgeom/measures3d.c | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
PostGIS