[geos-commits] [SCM] GEOS branch 3.10 updated. abd1766e74db918bb50312eb2ab15a2cec92fc02

[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, 3.10 has been updated
       via  abd1766e74db918bb50312eb2ab15a2cec92fc02 (commit)
      from  59a87ada77a6de3440652f7b7c20f4f286a8ac07 (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 abd1766e74db918bb50312eb2ab15a2cec92fc02
Author: Mike Taves <mwtoews at gmail.com>
Date:   Mon Jan 15 09:56:55 2024 +1300

    Fix StringTokenizer::peekNextToken (#1025)

diff --git a/NEWS b/NEWS
index 091698352..a51f01469 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@
   - PointOnSurface crashes with a collection containing a empty linestring (GH-1002, Paul Ramsey)
   - Fix IsSimpleOp for MultiPoint with empty element (GH-1005, Martin Davis)
   - Fix PreparedPolygonContains for GC with MultiPoint (GH-1008, Martin Davis)
+  - Fix reading WKT with EMPTY token with white space (GH-1025, Mike Taves)
 
 ## Changes in 3.10.6
 2023-11-11
diff --git a/src/io/StringTokenizer.cpp b/src/io/StringTokenizer.cpp
index 5735913cc..e016299eb 100644
--- a/src/io/StringTokenizer.cpp
+++ b/src/io/StringTokenizer.cpp
@@ -154,10 +154,8 @@ StringTokenizer::peekNextToken()
         return str[pos];
     }
 
-    // It's either a Number or a Word, let's
-    // see when it ends
-
-    pos = str.find_first_of("\n\r\t() ,", static_cast<string::size_type>(iter - str.begin()));
+    // It's either a Number or a Word, let's see when it ends
+    pos = str.find_first_of("\n\r\t() ,", pos + 1);
 
     if(pos == string::npos) {
         if(iter != str.end()) {
diff --git a/tests/unit/io/WKTReaderTest.cpp b/tests/unit/io/WKTReaderTest.cpp
index ce17d758a..cd9980430 100644
--- a/tests/unit/io/WKTReaderTest.cpp
+++ b/tests/unit/io/WKTReaderTest.cpp
@@ -304,4 +304,15 @@ void object::test<12>
 }
 
 
+// EMPTY token with some white space
+template<>
+template<>
+void object::test<13>
+()
+{
+    GeomPtr geom(wktreader.read("MULTIPOINT( EMPTY, (10 10), (20 20))"));
+
+    ensure_equals(geom->getNumGeometries(), 3u);
+}
+
 } // namespace tut

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

Summary of changes:
 NEWS                            |  1 +
 src/io/StringTokenizer.cpp      |  6 ++----
 tests/unit/io/WKTReaderTest.cpp | 11 +++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GEOS