USGSDEM: avoid int overflow. Fixes https://bugs.chromium.org/p/oss-fu…

…zz/issues/detail?id=15715. Credit to OSS Fuzz
OSGeo · Jul 19, 2019 · ade6de9 · ade6de9
1 parent 63766b9
commit ade6de9
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/gdal/frmts/usgsdem/usgsdemdataset.cpp b/gdal/frmts/usgsdem/usgsdemdataset.cpp
@@ -804,7 +804,10 @@ int USGSDEMDataset::LoadFromFile(VSILFILE *InDem)
         adfGeoTransform[5] = (-dydelta) / 3600.0;
     }
 
-    if (!GDALCheckDatasetDimensions(nRasterXSize, nRasterYSize))
+    // IReadBlock() not ready for more than INT_MAX pixels, and that
+    // would behave badly
+    if (!GDALCheckDatasetDimensions(nRasterXSize, nRasterYSize) ||
+        nRasterXSize > INT_MAX / nRasterYSize)
     {
         return FALSE;
     }