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

[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  feaa331749598866ffc47c3f2bef828eaa4eff8f (commit)
       via  356a18e078bb7903b42be276f5169fc106ad481d (commit)
      from  193dacad1128de3a9be032eaf13a0f4081fcae76 (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 feaa331749598866ffc47c3f2bef828eaa4eff8f
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Aug 11 10:27:45 2023 +0200

    Chat bridges are down

diff --git a/web/content/project/development/_index.md b/web/content/project/development/_index.md
index 192788346..2f4eb6855 100644
--- a/web/content/project/development/_index.md
+++ b/web/content/project/development/_index.md
@@ -9,7 +9,7 @@ weight: 5
 
 * **git** repository: https://github.com/libgeos/geos
 * [**geos-devel** mailing list](https://lists.osgeo.org/mailman/listinfo/geos-devel) and [archive](https://lists.osgeo.org/pipermail/geos-devel/)
-* **#geos** chat channel (all bridged):
+* **#geos** chat channels:
   * Matrix: https://matrix.to/#/#geos:osgeo.org
   * IRC: irc://irc.libera.chat/#osgeo-geos (https://kiwiirc.com/nextclient/irc.libera.chat/#osgeo-geos)
   * Slack: https://osgeo.slack.com/messages/C07RKJ06B/

commit 356a18e078bb7903b42be276f5169fc106ad481d
Author: Shuduo Sang <sangshuduo at gmail.com>
Date:   Wed Aug 9 08:54:29 2023 +0800

    Fix C-API null pointer deref on col (#943)

diff --git a/capi/geos_ts_c.cpp b/capi/geos_ts_c.cpp
index 69ea4f510..1611118b1 100644
--- a/capi/geos_ts_c.cpp
+++ b/capi/geos_ts_c.cpp
@@ -1184,7 +1184,7 @@ extern "C" {
     {
         return execute(extHandle, [&]() {
             BufferParameters bp;
-            //-- use default cap style ROUND 
+            //-- use default cap style ROUND
             bp.setQuadrantSegments(quadsegs);
 
             if(joinStyle > BufferParameters::JOIN_BEVEL) {
@@ -2069,10 +2069,11 @@ extern "C" {
             GeometryCollection *col = dynamic_cast<GeometryCollection*>(collection);
             if (!col) {
                 handle->ERROR_MESSAGE("Parameter collection of GEOSGeom_releaseCollection_r must not be a collection");
+            } else {
+                *ngeoms = static_cast<unsigned int>(col->getNumGeometries());
             }
 
             // Early exit on empty/null input
-            *ngeoms = static_cast<unsigned int>(col->getNumGeometries());
             if (!col || *ngeoms == 0) {
                 return static_cast<Geometry**>(nullptr);
             }

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

Summary of changes:
 capi/geos_ts_c.cpp                        | 5 +++--
 web/content/project/development/_index.md | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GEOS