Bugfix for issue: xls file cause the exception during open by Xls reader #402

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+- Xls file cause the exception during open by Xls reader [#402](https://github.com/PHPOffice/PhpSpreadsheet/issues/402)
 - Sheet title can contain exclamation mark - [#325](https://github.com/PHPOffice/PhpSpreadsheet/issues/325)
 
 ## [1.4.1] - 2018-09-30

src/PhpSpreadsheet/Shared/OLERead.php

@@ -326,14 +326,6 @@ private function readPropertySets()
      */
     private static function getInt4d($data, $pos)
     {
-        if (trim($data) == '') {
-            // No data provided
-            throw new ReaderException('Parameter data is empty.');
-        } elseif ($pos < 0) {
-            // Invalid position
-            throw new ReaderException('Parameter pos=' . $pos . ' is invalid.');
-        }
-
         $len = strlen($data);
         if ($len < $pos + 4) {
             $data .= str_repeat("\0", $pos + 4 - $len);

tests/PhpSpreadsheetTests/Reader/XlsTest.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xls;
+use PHPUnit\Framework\TestCase;
+
+class XlsTest extends TestCase
+{
+    /**
+     * Test load Xls file.
+     */
+    public function testLoadXlsSample()
+    {
+        $filename = './data/Reader/XLS/sample.xls';
+        $reader = new Xls();
+        $spreadsheet = $reader->load($filename);
+        self::assertEquals('Title', $spreadsheet->getSheet(0)->getCell('A1')->getValue());
+    }
+}

tests/PhpSpreadsheetTests/Shared/OLEReadTest.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Shared;
+
+use PhpOffice\PhpSpreadsheet\Shared\OLERead;
+use PHPUnit\Framework\TestCase;
+
+class OLEReadTest extends TestCase
+{
+    public function testReadOleStreams()
+    {
+        $dataDir = './data/Shared/OLERead/';
+        $ole = new OLERead();
+        $ole->read('./data/Reader/XLS/sample.xls');
+        self::assertEquals(
+            file_get_contents($dataDir . 'wrkbook'),
+            $ole->getStream($ole->wrkbook)
+        );
+        self::assertEquals(
+            file_get_contents($dataDir . 'summary'),
+            $ole->getStream($ole->summaryInformation)
+        );
+        self::assertEquals(
+            file_get_contents($dataDir . 'document'),
+            $ole->getStream($ole->documentSummaryInformation)
+        );
+    }
+}