[SCM] PostGIS branch stable-3.4 updated. 3.4.1-34-gbe9cd58ce

[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  be9cd58ce5e695d8620f175b1dad0430081d67d6 (commit)
      from  9cd9194f5ac3cf52d74adc197aa794d6abb878a9 (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 be9cd58ce5e695d8620f175b1dad0430081d67d6
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Jan 11 13:50:16 2024 -0800

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

diff --git a/NEWS b/NEWS
index 8d3618a65..478ba0186 100644
--- a/NEWS
+++ b/NEWS
@@ -17,7 +17,7 @@ To take advantage of all SFCGAL featurs, SFCGAL 1.4.1+ is needed.
  - #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)
-
+ - #5580, Handle empty collection components in 3d distance (Paul Ramsey)
 
 * Bug Fixes and Enhancments *
 
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                   | 2 +-
 liblwgeom/measures3d.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
PostGIS