[SCM] PostGIS branch master updated. 3.6.0rc2-320-gc6e7bc8e4

[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  c6e7bc8e4381194f3bac5b7cc0a30e30b7cd346c (commit)
       via  977e9151311cad1d00fecd01a7e77f22ae73c1b6 (commit)
       via  b28bc35beca31f80c452e2c6847812560127c045 (commit)
       via  f8358f8cf2e7c4a01de151418d26d7604d74b6d4 (commit)
       via  e4b6aeec9317a7e577e202257edcb18917ee2853 (commit)
       via  236a082d028ff1301488693aa8c0b0307b037243 (commit)
      from  c46ac95186fe924b99f75c750afdcf75c6885496 (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 c6e7bc8e4381194f3bac5b7cc0a30e30b7cd346c
Merge: c46ac9518 977e91513
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Jan 27 08:39:14 2026 -0800

    Merge branch 'ProjectMutilation-sgp2pgsql-gui-fix-double-free'


commit 977e9151311cad1d00fecd01a7e77f22ae73c1b6
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Jan 27 10:14:37 2026 +0100

    Fix URL in comment

diff --git a/topology/test/regress/topogeo_addlinestring.sql b/topology/test/regress/topogeo_addlinestring.sql
index 50c716b6b..c7ba53e90 100644
--- a/topology/test/regress/topogeo_addlinestring.sql
+++ b/topology/test/regress/topogeo_addlinestring.sql
@@ -390,7 +390,7 @@ SELECT 't4757.1', topology.TopoGeo_addLinestring('bug4757',
   'LINESTRING(0 -0.1,1 0,1 1,0 1,0 -0.1)', 1);
 SELECT 't4757.end', topology.DropTopology('bug4757');
 
--- See https://trac.osgeo.org/postgis/ticket/t4758
+-- See https://trac.osgeo.org/postgis/ticket/4758
 select 't4758.start', topology.CreateTopology ('t4758', 0, 1e-06) > 0;
 select 't4758.0', topology.TopoGeo_addLinestring('t4758',
   'LINESTRING(11.38327215  60.4081942, 11.3826176   60.4089484)');

commit b28bc35beca31f80c452e2c6847812560127c045
Author: Maksim Korotkov <m.korotkov at postgrespro.ru>
Date:   Mon Jan 26 17:41:52 2026 +0300

    Replace check for avoiding NULL dereference
    
    Fixes: 9726c4770 ("missed file commit for ST_Centroid Geography support references #2951")
    
    Signed-off-by: Maksim Korotkov <m.korotkov at postgrespro.ru>

diff --git a/postgis/geography_centroid.c b/postgis/geography_centroid.c
index 386e029ba..8a4881671 100644
--- a/postgis/geography_centroid.c
+++ b/postgis/geography_centroid.c
@@ -63,13 +63,13 @@ Datum geography_centroid(PG_FUNCTION_ARGS)
 
 	/* Get our geometry object loaded into memory. */
 	g = PG_GETARG_GSERIALIZED_P(0);
-	lwgeom = lwgeom_from_gserialized(g);
 
 	if (g == NULL)
 	{
 		PG_RETURN_NULL();
 	}
 
+    lwgeom = lwgeom_from_gserialized(g);
 	srid = lwgeom_get_srid(lwgeom);
 
 	/* on empty input, return empty output */

commit f8358f8cf2e7c4a01de151418d26d7604d74b6d4
Author: Maksim Korotkov <m.korotkov at postgrespro.ru>
Date:   Mon Jan 26 12:30:55 2026 +0300

    shp2pgsql-gui: fix use after free
    The ShpLoaderDestroy() free the pointer state,
    that was dereferenced later.
    Found by PostgresPro with Svace Static Analyzer.
    Fixes: 4daaecbc8 ("Commit reworked version of shp2pgsql-gui to the repository.")
    Signed-off-by: Maksim Korotkov <m.korotkov at postgrespro.ru>

diff --git a/loader/shp2pgsql-gui.c b/loader/shp2pgsql-gui.c
index 5efa670b8..bfc301f50 100644
--- a/loader/shp2pgsql-gui.c
+++ b/loader/shp2pgsql-gui.c
@@ -1215,6 +1215,7 @@ validate_remote_loader_columns(SHPLOADERCONFIG *config, PGresult *result)
 					{
 						pgui_logf(_("Warning: Could not load shapefile %s"), config->shp_file);
 						ShpLoaderDestroy(state);
+						return SHPLOADERERR;
 					}
 
 					/* Find each column based upon its name and then validate type separately... */

commit e4b6aeec9317a7e577e202257edcb18917ee2853
Author: Regina Obe <lr at pcorp.us>
Date:   Mon Jan 26 02:53:22 2026 -0500

    Put in PG_MODULE_MAGIC in address_standardizer for PG < 18
    Closes #6039 for PostGIS 3.7.0

diff --git a/extensions/address_standardizer/address_standardizer.c b/extensions/address_standardizer/address_standardizer.c
index f4170b4a7..5d4483d32 100644
--- a/extensions/address_standardizer/address_standardizer.c
+++ b/extensions/address_standardizer/address_standardizer.c
@@ -21,6 +21,8 @@ PG_MODULE_MAGIC_EXT(
 	.name = "address_standardizer",
 	.version = POSTGIS_LIB_VERSION
 	);
+#else
+	PG_MODULE_MAGIC;
 #endif
 
 Datum debug_standardize_address(PG_FUNCTION_ARGS);

commit 236a082d028ff1301488693aa8c0b0307b037243
Author: Maksim Korotkov <m.korotkov at postgrespro.ru>
Date:   Mon Jan 26 13:10:44 2026 +0300

    shp2pgsql-gui: avoid potential double free
    
    If we enter `import_cleanup` before allocating new memory,
    `progress_shapefile` will be freed twice on the next iteration.
    
    Also removed redundant check against NULL,
    free(NULL) is No Operation per the C standard.
    
    Found by PostgresPro
    Fixes: 4daaecbc8 ("Commit reworked version of shp2pgsql-gui to the repository.")
    Signed-off-by: Maksim Korotkov <m.korotkov at postgrespro.ru>

diff --git a/loader/shp2pgsql-gui.c b/loader/shp2pgsql-gui.c
index 847e69af7..5efa670b8 100644
--- a/loader/shp2pgsql-gui.c
+++ b/loader/shp2pgsql-gui.c
@@ -1755,8 +1755,8 @@ import_cleanup:
 		ShpLoaderDestroy(state);
 
 		/* Tidy up */
-		if (progress_shapefile)
-			free(progress_shapefile);
+		free(progress_shapefile);
+		progress_shapefile = NULL;
 
 		/* Get next entry */
 		is_valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(import_file_list_store), &iter);

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

Summary of changes:
 loader/shp2pgsql-gui.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
PostGIS