[SCM] PostGIS branch master updated. 3.6.0rc2-313-ga499e6aad

[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  a499e6aad103ecd73be69eca090ab50db9d6bd4f (commit)
       via  ccf2a8ae4a1c40316f8096ca339a25abb59be9bc (commit)
       via  18d4a506c2ab4048b8421dd92f4fc30083ea84be (commit)
       via  f07827d46867580713eff4d4bc3be8e0fbd85dab (commit)
      from  2861e6f495ce37385f33b43abd75212cfee8126a (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 a499e6aad103ecd73be69eca090ab50db9d6bd4f
Merge: 2861e6f49 ccf2a8ae4
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Mon Jan 26 12:34:51 2026 -0800

    Merge branch 'ProjectMutilation-geography_centroid-replace-null-check'


commit ccf2a8ae4a1c40316f8096ca339a25abb59be9bc
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 847e69af7..00ffda526 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 18d4a506c2ab4048b8421dd92f4fc30083ea84be
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 f07827d46867580713eff4d4bc3be8e0fbd85dab
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 */

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

Summary of changes:
 postgis/geography_centroid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
PostGIS