[geos-commits] [SCM] GEOS branch main updated. f593230f5907260096202ef0302abe99b81c0bf7

[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 "GEOS".

The branch, main has been updated
       via  f593230f5907260096202ef0302abe99b81c0bf7 (commit)
      from  5f4af4116e39ec9f859d8a64adc74cd4f4ffb349 (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 f593230f5907260096202ef0302abe99b81c0bf7
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Wed Aug 25 15:42:37 2021 -0700

    Sanitize fix to ensure stack allocated envelope is available to edgeNodingBuilder, closes https://github.com/libgeos/geos/issues/476

diff --git a/src/operation/overlayng/OverlayNG.cpp b/src/operation/overlayng/OverlayNG.cpp
index 709f288..4c37ddf 100644
--- a/src/operation/overlayng/OverlayNG.cpp
+++ b/src/operation/overlayng/OverlayNG.cpp
@@ -211,11 +211,13 @@ OverlayNG::computeEdgeOverlay()
      * Formerly in nodeEdges())
      */
     EdgeNodingBuilder nodingBuilder(pm, noder);
+    // clipEnv not always used, but needs to remain in scope
+    // as long as nodingBuilder when it is.
+    Envelope clipEnv;
 
     GEOS_CHECK_FOR_INTERRUPTS();
 
     if (isOptimized) {
-        Envelope clipEnv;
         bool gotClipEnv = OverlayUtil::clippingEnvelope(opCode, &inputGeom, pm, clipEnv);
         if (gotClipEnv) {
             nodingBuilder.setClipEnvelope(&clipEnv);

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

Summary of changes:
 src/operation/overlayng/OverlayNG.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GEOS