[SCM] PostGIS branch master updated. 3.5.0-470-g6fa083969

[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, master has been updated
       via  6fa083969d46eaa322e864ef1561e964513d67a3 (commit)
       via  f1071cb35eb31c2642e6c97599d8e90e93eb265e (commit)
      from  3484c5071f918c44a4418883b1860e20f32c0378 (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 6fa083969d46eaa322e864ef1561e964513d67a3
Author: Regina Obe <lr at pcorp.us>
Date:   Wed Jul 16 02:51:45 2025 -0400

    Try to get berrie64 compile with SFCGAL
    Use GEOS 3.11 which is same as GDAL is compiled with
    To prevent GDAL-GEOS / GEOS conflict
    References  #5945

diff --git a/ci/berrie64/configs.sh b/ci/berrie64/configs.sh
index 8cc3a7aa8..397c4f30f 100644
--- a/ci/berrie64/configs.sh
+++ b/ci/berrie64/configs.sh
@@ -1,5 +1,5 @@
 export WORKSPACE=/home/jenkins/workspace
-export GEOS_VER=3.14.0
+export GEOS_VER=3.11.6
 export SFCGAL_VER=master
 
 export OS_BUILD=64
@@ -8,10 +8,10 @@ export GEOS_PATH=${WORKSPACE}/geos/rel-${GEOS_VER}
 export SFCGAL_PATH=${WORKSPACE}/sfcgal/label/${label}/rel-sfcgal-${SFCGAL_VER}
 #export GEOS_PATH=~/geos/rel-${GEOS_VER}
 export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
-export PATH=${PGPATH}/bin:${PGPATH}/lib:${GEOS_PATH}/bin:${GEOS_PATH}/lib:${SFCGAL_PATH}/bin:${SFCGAL_PATH}/lib:${PATH}
+export PATH=${PGPATH}/bin:${PGPATH}/lib:${SFCGAL_PATH}/bin:${SFCGAL_PATH}/lib:${GEOS_PATH}/bin:${GEOS_PATH}/lib:${PATH}
 
-export PKG_CONFIG_PATH="${GEOS_PATH}/lib/pkgconfig:${SFCGAL_PATH}/lib/pkgconfig"
+export PKG_CONFIG_PATH="${SFCGAL_PATH}/lib/pkgconfig:${GEOS_PATH}/lib/pkgconfig"
 export PGPORT=55434
 export PGDATA=$PGPATH/data_${PGPORT}
 export PGHOST=localhost
-export LD_LIBRARY_PATH="${GEOS_PATH}/lib:${PGPATH}/lib"
+export LD_LIBRARY_PATH="${SFCGAL_PATH}/lib:${GEOS_PATH}/lib:${PGPATH}/lib"
diff --git a/ci/berrie64/postgis_regress.sh b/ci/berrie64/postgis_regress.sh
index 730b15382..35221bb3d 100644
--- a/ci/berrie64/postgis_regress.sh
+++ b/ci/berrie64/postgis_regress.sh
@@ -14,8 +14,7 @@ export CONFIG_FILE="$CUR_DIR/configs.sh"
 echo $PATH
 
 sh autogen.sh
-./configure --with-pgconfig=${PGPATH}/bin/pg_config --with-geosconfig=${GEOS_PATH}/bin/geos-config --with-library-minor-version --enable-lto \
-    --with-sfcgal=${SFCGAL_PATH}/bin/sfcgal-config \
+./configure --with-pgconfig=${PGPATH}/bin/pg_config --with-geosconfig=${GEOS_PATH}/bin/geos-config --with-library-minor-version \
     --without-interrupt-tests --prefix=${PGPATH}
 #make clean
 make

commit f1071cb35eb31c2642e6c97599d8e90e93eb265e
Author: Regina Obe <lr at pcorp.us>
Date:   Tue Jul 15 22:01:43 2025 -0400

    Fix for GEOS GeometryFactory memory leak
    Contributed by: Megan Ma
    References #5943 for PostGIS 3.6.0

diff --git a/doc/introduction.xml b/doc/introduction.xml
index 98c4af7b5..4c41ff144 100644
--- a/doc/introduction.xml
+++ b/doc/introduction.xml
@@ -310,6 +310,7 @@
 					<member>Maxime Guillaud</member>
 					<member>Maxime van Noppen</member>
 					<member>Maxime Schoemans</member>
+					<member>Megan Ma</member>
 					<member>Michael Fuhr</member>
 					<member>Mike Toews</member>
 					<member>Nathan Wagner</member>
diff --git a/liblwgeom/lwgeom_geos.c b/liblwgeom/lwgeom_geos.c
index ed3c314b8..102ed604d 100644
--- a/liblwgeom/lwgeom_geos.c
+++ b/liblwgeom/lwgeom_geos.c
@@ -723,7 +723,7 @@ lwgeom_intersection_prec(const LWGEOM* geom1, const LWGEOM* geom2, double prec)
 		g3 = GEOSIntersection(g1, g2);
 	}
 
-	if (!g3) GEOS_FREE_AND_FAIL(g1);
+	if (!g3) GEOS_FREE_AND_FAIL(g1, g2);
 	GEOSSetSRID(g3, srid);
 
 	if (!(result = GEOS2LWGEOM(g3, is3d))) GEOS_FREE_AND_FAIL(g1, g2, g3);
@@ -1145,7 +1145,7 @@ lwgeom_buildarea(const LWGEOM* geom)
 	/* If no geometries are in result collection, return NULL */
 	if (GEOSGetNumGeometries(g3) == 0)
 	{
-		GEOS_FREE(g1);
+		GEOS_FREE(g1, g3);
 		return NULL;
 	}
 
diff --git a/postgis/lwgeom_geos_predicates.c b/postgis/lwgeom_geos_predicates.c
index 0ad18f4ed..092795921 100644
--- a/postgis/lwgeom_geos_predicates.c
+++ b/postgis/lwgeom_geos_predicates.c
@@ -1001,7 +1001,11 @@ Datum relate_full(PG_FUNCTION_ARGS)
 	POSTGIS_DEBUGF(3, "%s", GEOSGeomToWKT(g2));
 
 	relate_str = GEOSRelateBoundaryNodeRule(g1, g2, bnr);
-	if (!relate_str) HANDLE_GEOS_ERROR("GEOSRelate");
+	if (!relate_str) {
+		GEOSGeom_destroy(g1);
+		GEOSGeom_destroy(g2);
+		HANDLE_GEOS_ERROR("GEOSRelate");
+	}
 	result = cstring_to_text(relate_str);
 	GEOSFree(relate_str);
 	GEOSGeom_destroy(g1);

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

Summary of changes:
 ci/berrie64/configs.sh           | 8 ++++----
 ci/berrie64/postgis_regress.sh   | 3 +--
 doc/introduction.xml             | 1 +
 liblwgeom/lwgeom_geos.c          | 4 ++--
 postgis/lwgeom_geos_predicates.c | 6 +++++-
 5 files changed, 13 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
PostGIS