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

libgeos · Oct 24, 2024 · d630386 · d630386
1 parent 631bf0e
commit d630386
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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);
             }