[postgis-tickets] [SCM] PostGIS branch stable-3.2 updated. 3.2.5-7-gccb42dfe4

[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-3.2 has been updated
       via  ccb42dfe4f253ff05cfa11b88d4e5bfd769bcd10 (commit)
      from  b8bdce6072e78c4c829530e8d8e6385a4b02ad22 (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 ccb42dfe4f253ff05cfa11b88d4e5bfd769bcd10
Author: Regina Obe <lr at pcorp.us>
Date:   Wed Jun 28 23:40:55 2023 -0400

    Prevent crash in mvt
    References #5385 for PostGIS 3.2.6

diff --git a/NEWS b/NEWS
index d659a04b4..f2b2f864f 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,14 @@ Proj 6.1+, and PostgreSQL 14+.
   - #5410, [postgis_raster] ST_Value bilinear resample,
            don't throw an error if Band has no NODATA value
            (Regina Obe)
+  - #5385, Postgres malloc assertion fail when
+           using pg_cancel_backend with ST_AsMVT
+           (Regina Obe, Paul Ramsey)
+
+* Breaking Changes *
+    - #5385, Take out interruptability of ST_AsMVT
+             as it causes backend crash under intense conditions
+            (Regina Obe, Paul Ramsey)
 
 
 PostGIS 3.2.5
diff --git a/postgis/postgis_module.c b/postgis/postgis_module.c
index 764244bc4..b084062c0 100644
--- a/postgis/postgis_module.c
+++ b/postgis/postgis_module.c
@@ -97,7 +97,8 @@ handleInterrupt(int sig)
   GEOS_interruptRequest();
 
 #ifdef HAVE_LIBPROTOBUF
-  lwgeom_wagyu_interruptRequest();
+	/* Taking out per #5385 crash */
+  //lwgeom_wagyu_interruptRequest();
 #endif
 
   /* request interruption of liblwgeom as well */
@@ -107,3 +108,25 @@ handleInterrupt(int sig)
     (*coreIntHandler)(sig);
   }
 }
+<<<<<<< HEAD
+=======
+
+static void onExecutorStart(QueryDesc *queryDesc, int eflags) {
+    /* cancel interrupt requests */
+
+    GEOS_interruptCancel();
+
+#ifdef HAVE_LIBPROTOBUF
+		/* Taking out per #5385 crash */
+    //lwgeom_wagyu_interruptReset();
+#endif
+
+    lwgeom_cancel_interrupt();
+
+    if (onExecutorStartPrev) {
+        (*onExecutorStartPrev)(queryDesc, eflags);
+    } else {
+        standard_ExecutorStart(queryDesc, eflags);
+    }
+}
+>>>>>>> c4d01ce30... Prevent crash in mvt

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

Summary of changes:
 NEWS                     |  8 ++++++++
 postgis/postgis_module.c | 25 ++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
PostGIS