diff --git a/CHANGELOG.md b/CHANGELOG.md index ed36265337..e859fe9c1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org). - Improved performance when loading large spreadsheets - [#825](https://github.com/PHPOffice/PhpSpreadsheet/pull/825) - Improved performance when loading large spreadsheets - [#824](https://github.com/PHPOffice/PhpSpreadsheet/pull/824) - Fix color from CSS when reading from HTML - [#831](https://github.com/PHPOffice/PhpSpreadsheet/pull/831) +- Fix infinite loop when reading invalid ODS files - [#832](https://github.com/PHPOffice/PhpSpreadsheet/pull/832) ## [1.5.2] - 2018-11-25 diff --git a/src/PhpSpreadsheet/Reader/Ods.php b/src/PhpSpreadsheet/Reader/Ods.php index 2fb4b7f8ba..0941f035df 100644 --- a/src/PhpSpreadsheet/Reader/Ods.php +++ b/src/PhpSpreadsheet/Reader/Ods.php @@ -210,6 +210,8 @@ public function listWorksheetInfo($pFilename) $mergeSize = $xml->getAttribute('table:number-columns-repeated'); $currCells += (int) $mergeSize; $xml->read(); + } else { + $xml->read(); } } while ($xml->name != 'table:table-row'); }