aaigriddataset: Improve search for float data. (#2972)

Only scan the bytes actually read by VSIFReadL. Fixes #2970
OSGeo · Sep 25, 2020 · 8b12521 · 8b12521
1 parent c332dc9
commit 8b12521
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/gdal/frmts/aaigrid/aaigriddataset.cpp b/gdal/frmts/aaigrid/aaigriddataset.cpp
@@ -1037,11 +1037,11 @@ GDALDataset *AAIGDataset::CommonOpen( GDALOpenInfo *poOpenInfo,
         // Scan for dot in subsequent chunks of data.
         while( !VSIFEofL(poDS->fp) )
         {
-            CPL_IGNORE_RET_VAL(VSIFReadL(pabyChunk, nChunkSize, 1, poDS->fp));
+            const size_t nLen = VSIFReadL(pabyChunk, 1, nChunkSize, poDS->fp);
 
-            for( int i = 0; i < static_cast<int>(nChunkSize); i++)
+            for( size_t i = 0; i < nLen; i++)
             {
-                GByte ch = pabyChunk[i];
+                const GByte ch = pabyChunk[i];
                 if (ch == '.' || ch == ',' || ch == 'e' || ch == 'E')
                 {
                     poDS->eDataType = GDT_Float32;