[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha2-28-gee6afa6

[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  ee6afa6c787a02d28ebbdc2905f6d7fa77a6da39 (commit)
      from  728c6e8b2df6dc3d172240a776141a5909026dd8 (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 ee6afa6c787a02d28ebbdc2905f6d7fa77a6da39
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 319f74b..8cd71f0 100644
--- a/NEWS
+++ b/NEWS
@@ -24,7 +24,8 @@ Only tickets not included in 3.1.0alpha2
 
 
 * Bug fixes *
-  -
+  - #4691, Fix segfault during gist index creation with empty geometries (Raúl Marín)
+
 
 PostGIS 3.1.0alpha2
 2020/07/18
diff --git a/postgis/gserialized_gist_nd.c b/postgis/gserialized_gist_nd.c
index 8475446..2ea7a1c 100644
--- a/postgis/gserialized_gist_nd.c
+++ b/postgis/gserialized_gist_nd.c
@@ -173,7 +173,8 @@ gidx_merge(GIDX **b_union, GIDX *b_new)
 	/* Q: Unknown is 0 dimensions. Should we never modify unknown instead? (ticket #4232) */
 	if (gidx_is_unknown(*b_union))
 	{
-		*b_union = b_new;
+		pfree(*b_union);
+		*b_union = gidx_copy(b_new);
 		return;
 	}
 

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

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


hooks/post-receive
-- 
PostGIS