[postgis-tickets] [SCM] PostGIS branch stable-2.5 updated. 2.5.4-25-ga695e05

[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-2.5 has been updated
       via  a695e0597a89858663a003ede2bd1e566a89e538 (commit)
      from  9d503a82a19173708eb200189aa9b126e448db93 (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 a695e0597a89858663a003ede2bd1e566a89e538
Author: Raúl Marín <git at rmr.ninja>
Date:   Wed Jul 29 17:43:57 2020 +0200

    Avoid double freeing due to gidx_merge
    
    References #4691

diff --git a/NEWS b/NEWS
index 5e5c212..38c2314 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ PostGIS 2.5.5
   - #4661, Fix access to spatial_ref_sys with a non default schema (Raúl Marín)
   - #4670, ST_AddPoint: Fix bug when a positive position is requested (Raúl Marín)
   - #4699, crash on null input to ST_Union(raster, otherarg) (Jaime Casanova, 2ndQuadrant)
+  - #4691, Fix segfault during gist index creation with empty geometries (Raúl Marín)
 
 PostGIS 2.5.4
 2020/02/28
diff --git a/postgis/gserialized_gist_nd.c b/postgis/gserialized_gist_nd.c
index 44540a6..e130c0f 100644
--- a/postgis/gserialized_gist_nd.c
+++ b/postgis/gserialized_gist_nd.c
@@ -184,7 +184,8 @@ void gidx_merge(GIDX **b_union, GIDX *b_new)
 	/* Merge of unknown and known is known */
 	if( gidx_is_unknown(*b_union) )
 	{
-		*b_union = b_new;
+		pfree(*b_union);
+		*b_union = gidx_copy(b_new);
 		return;
 	}
 

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

Summary of changes:
 NEWS                          | 1 +
 postgis/gserialized_gist_nd.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
PostGIS