XLSX: avoid adding too many columns to too many existing feataures. F…

…ixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8122. Credit to OSS Fuzz
OSGeo · May 3, 2018 · 4f3f1fa · 4f3f1fa
1 parent d95f051
commit 4f3f1fa
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp b/gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp
@@ -905,6 +905,17 @@ void OGRXLSXDataSource::endElementRow(CPL_UNUSED const char *pszNameIn)
             if (apoCurLineValues.size() >
                 (size_t)poCurLayer->GetLayerDefn()->GetFieldCount())
             {
+                GIntBig nFeatureCount = poCurLayer->GetFeatureCount(false);
+                if( nFeatureCount > 0 &&
+                    static_cast<size_t>(apoCurLineValues.size() -
+                        poCurLayer->GetLayerDefn()->GetFieldCount()) >
+                            static_cast<size_t>(100000 / nFeatureCount) )
+                {
+                    CPLError(CE_Failure, CPLE_NotSupported,
+                             "Adding too many columns to too many "
+                             "existing features");
+                    return;
+                }
                 for( size_t i = (size_t)poCurLayer->GetLayerDefn()->GetFieldCount();
                      i < apoCurLineValues.size();
                      i++ )