Skip to content

Commit

Permalink
Fix XLSX reader when having a corrupt numeric cell data type (#1664)
Browse files Browse the repository at this point in the history
* fix for read xlsx with somewhat corrupt cell data type
  • Loading branch information
brainfoolong committed Feb 1, 2021
1 parent d28b7de commit fa51a85
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Expand Up @@ -128,6 +128,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
- Reader/Gnumeric Failure with PHP8 [#1662](https://github.com/phpoffice/phpspreadsheet/pull/1662)
- ReverseSort bug, exposed but not caused by PHP8 [#1660](https://github.com/phpoffice/phpspreadsheet/pull/1660)
- Bug setting Superscript/Subscript to false [#1567](https://github.com/phpoffice/phpspreadsheet/pull/1567)
- Fix XLSX reader when having a corrupt numeric cell data type [#1664](https://github.com/phpoffice/phpspreadsheet/pull/1664)

## 1.14.1 - 2020-07-19

Expand Down Expand Up @@ -656,4 +657,4 @@ For a comprehensive list of all class changes, and a semi-automated migration pa

## Previous versions of PHPExcel

The changelog for the project when it was called PHPExcel is [still available](./CHANGELOG.PHPExcel.md).
The changelog for the project when it was called PHPExcel is [still available](./CHANGELOG.PHPExcel.md).
5 changes: 5 additions & 0 deletions src/PhpSpreadsheet/Reader/Xlsx.php
Expand Up @@ -3,6 +3,7 @@
namespace PhpOffice\PhpSpreadsheet\Reader;

use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
use PhpOffice\PhpSpreadsheet\Cell\DataType;
use PhpOffice\PhpSpreadsheet\Cell\Hyperlink;
use PhpOffice\PhpSpreadsheet\DefinedName;
use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
Expand Down Expand Up @@ -735,6 +736,10 @@ public function load($pFilename)
$cell = $docSheet->getCell($r);
// Assign value
if ($cellDataType != '') {
// it is possible, that datatype is numeric but with an empty string, which result in an error
if ($cellDataType === DataType::TYPE_NUMERIC && $value === '') {
$cellDataType = DataType::TYPE_STRING;
}
$cell->setValueExplicit($value, $cellDataType);
} else {
$cell->setValue($value);
Expand Down

0 comments on commit fa51a85

Please sign in to comment.