[SCM] PostGIS branch master updated. 3.6.0rc2-309-g2861e6f49

[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  2861e6f495ce37385f33b43abd75212cfee8126a (commit)
       via  18c011f890ca8083b88783892278d57dbc34e8fc (commit)
       via  b04c70aeb8fd672042024a10e476855c8a32892f (commit)
      from  ac06bce19b443a65eeda3eb14734804373cb1773 (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 2861e6f495ce37385f33b43abd75212cfee8126a
Merge: ac06bce19 18c011f89
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Mon Jan 26 12:27:56 2026 -0800

    Merge branch 'ProjectMutilation-sgp2pgsql-gui-fix-use-after-free'


commit 18c011f890ca8083b88783892278d57dbc34e8fc
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 b04c70aeb8fd672042024a10e476855c8a32892f
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... */

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

Summary of changes:
 loader/shp2pgsql-gui.c | 1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
PostGIS