OGR: Support multiline WKT input

tannewt · May 5, 2021 · c7311e6 · c7311e6
1 parent f6c8e7a
commit c7311e6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/autotest/ogr/ogr_wkbwkt_geom.py b/autotest/ogr/ogr_wkbwkt_geom.py
@@ -360,7 +360,7 @@ def test_ogr_wkbwkt_test_broken_geom():
         gdal.PopErrorHandler()
         assert geom is None, ('geom %s instantiated but not expected' % wkt)
 
-    
+
 ###############################################################################
 # Test importing WKT SF1.2
 
@@ -484,7 +484,7 @@ def test_ogr_wkbwkt_test_import_wkt_sf12():
             ('in=%s, out=%s, expected=%s.' % (wkt_tuple[0], out_wkt,
                                                  wkt_tuple[1]))
 
-    
+
 ###############################################################################
 # Test that importing the wkb that would be equivalent to MULTIPOINT(POLYGON((0 0))
 # doesn't work
@@ -525,7 +525,7 @@ def test_ogr_wkbwkt_test_geometrycollection_wktwkb():
         wkt2 = g.ExportToWkt()
         assert wkt == wkt2, ('fail for %s' % wkt)
 
-    
+
 ###############################################################################
 # Test that importing too nested WKT doesn't cause stack overflows
 
@@ -608,6 +608,17 @@ def test_ogr_wkt_multipolygon_corrupted():
         g = ogr.CreateGeometryFromWkt('MULTIPOLYGON(POLYGON((N')
     assert g is None
 
+###############################################################################
+# Test multiline WKT
+
+
+def test_ogr_wkt_multiline():
+    g = ogr.CreateGeometryFromWkt("""GEOMETRYCOLLECTION(
+    POINT (1 2),
+    LINESTRING (3 3, 4 4))
+    """)
+    assert g is not None
+
 ###############################################################################
 # When imported build a list of units based on the files available.
 

diff --git a/gdal/ogr/ogrutils.cpp b/gdal/ogr/ogrutils.cpp
@@ -409,7 +409,7 @@ const char *OGRWktReadToken( const char * pszInput, char * pszToken )
 /* -------------------------------------------------------------------- */
 /*      Swallow pre-white space.                                        */
 /* -------------------------------------------------------------------- */
-    while( *pszInput == ' ' || *pszInput == '\t' )
+    while( *pszInput == ' ' || *pszInput == '\t' || *pszInput == '\n' || *pszInput == '\r' )
         ++pszInput;
 
 /* -------------------------------------------------------------------- */
@@ -448,7 +448,7 @@ const char *OGRWktReadToken( const char * pszInput, char * pszToken )
 /* -------------------------------------------------------------------- */
 /*      Eat any trailing white space.                                   */
 /* -------------------------------------------------------------------- */
-    while( *pszInput == ' ' || *pszInput == '\t' )
+    while( *pszInput == ' ' || *pszInput == '\t' || *pszInput == '\n' || *pszInput == '\r' )
         ++pszInput;
 
     return pszInput;