From 08b4456641f09f142dd5c2b7e72dc6490adc2d2f Mon Sep 17 00:00:00 2001
From: bayzhanov <bayzhanov@samsonpost.ru>
Date: Sun, 7 Oct 2018 18:38:13 +1100
Subject: [PATCH] Xls file threw exception during open by Xls reader

Ignore some exception in property, if stream is empty

Fixes #402
Fixes #659
---
 CHANGELOG.md                                  |   1 +
 src/PhpSpreadsheet/Shared/OLERead.php         |   5 +---
 tests/PhpSpreadsheetTests/Reader/XlsTest.php  |  20 +++++++++++++
 .../Shared/OLEReadTest.php                    |  28 ++++++++++++++++++
 tests/data/Reader/XLS/sample.xls              | Bin 0 -> 5109 bytes
 tests/data/Shared/OLERead/document            |   0
 tests/data/Shared/OLERead/summary             |   0
 tests/data/Shared/OLERead/wrkbook             | Bin 0 -> 3061 bytes
 8 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Reader/XlsTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Shared/OLEReadTest.php
 create mode 100644 tests/data/Reader/XLS/sample.xls
 create mode 100755 tests/data/Shared/OLERead/document
 create mode 100755 tests/data/Shared/OLERead/summary
 create mode 100755 tests/data/Shared/OLERead/wrkbook

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 963f01d8..8b1fcbd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 
 - Sheet title can contain exclamation mark - [#325](https://github.com/PHPOffice/PhpSpreadsheet/issues/325)
+- Xls file cause the exception during open by Xls reader - [#402](https://github.com/PHPOffice/PhpSpreadsheet/issues/402)
 
 ## [1.4.1] - 2018-09-30
 
diff --git a/src/PhpSpreadsheet/Shared/OLERead.php b/src/PhpSpreadsheet/Shared/OLERead.php
index 57554117..3af39700 100644
--- a/src/PhpSpreadsheet/Shared/OLERead.php
+++ b/src/PhpSpreadsheet/Shared/OLERead.php
@@ -326,10 +326,7 @@ class OLERead
      */
     private static function getInt4d($data, $pos)
     {
-        if (trim($data) == '') {
-            // No data provided
-            throw new ReaderException('Parameter data is empty.');
-        } elseif ($pos < 0) {
+        if ($pos < 0) {
             // Invalid position
             throw new ReaderException('Parameter pos=' . $pos . ' is invalid.');
         }
diff --git a/tests/PhpSpreadsheetTests/Reader/XlsTest.php b/tests/PhpSpreadsheetTests/Reader/XlsTest.php
new file mode 100644
index 00000000..f629fed1
--- /dev/null
+++ b/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());
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Shared/OLEReadTest.php b/tests/PhpSpreadsheetTests/Shared/OLEReadTest.php
new file mode 100644
index 00000000..a004c4ae
--- /dev/null
+++ b/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)
+        );
+    }
+}
diff --git a/tests/data/Reader/XLS/sample.xls b/tests/data/Reader/XLS/sample.xls
new file mode 100644
index 0000000000000000000000000000000000000000..65fcba55a8dcda0ea01ad60866092a231086643f
GIT binary patch
literal 5109
zcmeH~&u>&!6vxkd^Jd!V&zb2D1i?N8sUQMP4QLDq2pA$I$d71ZT$Iv6LuqSig)RuQ
zac>kbv(qIT6B9Q;B3&9Yi6;C3R{sJQlCV&opYOdh%s{7sxG^Gc=G^=4dEay2x#!$_
z&UruolwbV%+f~2XBiAlV+5IGInL2*Jy~tfTvydB&?<Yy(nP%KRyZ%EK_zPX-KT(7e
z(~x}L1T{nAKf9h@3mmm6ezO+aew(D9v3b1y<X0~{rfQuBvEeb|DLrrVp!a$EjGeWU
zPLH#XkzD$?U|~>wzxt(!#+<vYjrspKu6(9AE}t|y|5^Agkjy2QwL=|HCqxRcJXC<X
zpl+xK>V;N7&p|7pRnYU$YG@7g0@Me^&|2t4XdSd3dI{P9^+PX18=+0mE6`@>RcH&e
z6?zt%>UaJ>yU#Y`#Z206wU-t0UF_c(Xh-bCuZzLBmG@rW@VXw6>putw@a7NPCzn5~
z9QSmvhZ8(*!!}|6-qY3gRh?FWWrE{qbcU#Mj(*YYO|!d6461r9#Nulij{nD#@nxGv
z_~rPTwGsYl<_GR<YlXVJoppxqHMIXm&%fu<HT>pf@SB#wXB*-(?8-nf>d$=scHiwj
zi@tY$_k7}4m0!^_LmUhg&zA60%kVqkH<~A02CtL!F#dD<&HNct3Uf)U(kP=j4mU*^
zsL~YaiyCmVu&_W^v{EUt(%=~RxNK$cWBd~MHpaND35#wn%?XH+eqyVI2}W{d<ddXi
zCB{h!S>{d3B^w+|Y_MF04_Z`$#+ZJrWY?};GXOSNf-%S+DmfanJ9qBb_3PK|i!icW
zF_oy#7c;Ie6eHJn6`Nd-Lay&Frjt+c+K-VGOb5p}%cJ~e?VCXU38EF$r<D-oGL(;G
zxrZW|h00Yv!}+|lD=gS|8S!?jsa%&T<wz>8yk@2`@35O4wQ)$EyxLkDr^uN%bG30~
zk@dIL#%U^}D^0a=hS++gxi)U1#{RhOea)=rR-yJhYgxNdhi_q(H(F}XTgl1w<2H1z
z*SDQq9oETrkhiDm^ywsrAL^{lmm{D5Qa8@CM~8Z9&kJ~Cy1h2;;*8Y4znfTkwQl`A
z)B<0w^!VmbwE|ZVIF~I1ohF_e1oIDgQOLRD>cMsd@NwKdfzzY#O$Y6zoFLnrBBqa1
zt&ZDy0HZGZOxkISZHUn+_#?#pS^6nZ=Mh(x5-=+}XULA(yLJNRI#>b4O1rVUM!?P?
zvzPuPRmL`=#&$Mx6sqD0k>xZWw0#x1(96AHJ2<!7`0W5YNc);=w*ynflR_?Q!4XuP
zLa{ksGi!d9HM~2;EG-r+mEVDUAMz3Mt&hqdr$nE2R>?C*#2hSZ56e1ehmn&7)5u{#
zy;sH<wG`VvfTglb*ZSRRqfq5p1~5nIJ=7a^-vBcEd_^SVsyKmve@m@jSCe1Y+s?o;
zc-7dNF<@i&YQ_`TUjBFon3nJT(2Oh!ABH98MPZ6P(Tv0;3qE8OQ@DH_bZkqfkL?IL
zYVk98X_%#*r5cPY*iRfkb{T&j-Wd?$#dd*q7#WWp;$F|?bA9s+^S(*Osuc7sqS0w|
zk9j^rdj`&FTIr=;ixuMG*(TkBV)twW>>O**yJep9ylX47kMJ91q`CEWA-32@jJ$2K
z-Zn>pPNInSTDIbXxW9jocfne^7N7*Fnv0Jx*9;q5=VG=Z+Va5RKHPbSw<3yrj-lc-
zKP^k5L72gJt=dna%J4Q|q_%x1BS*>hbHGNNUA<?$NE^p83U$)k5g|(sIU__NTNhR@
zZ7@(lbW{<;b`e$=&pJS`SqI!X(piW?Rr#GD*|ht?$>DyNsgE(ATq51QBfJ`&PV)go
zbBI#dDQ5`gec~g<q+5-T460Zs*a==d=frg&@`z&}6_6JZ);5%*JS^{EYk?Jj;ekUu
zz5r~<4$w|xA%EmNyg<Dih59P$0*-+_>;UssXY6tieE@X>AsQ+0X=f|j#hmFmcIHV&
nRTp*hH5G;WB2tVc2viqZwMT5nfuBQ}iHh^QGCk<7kGa1Ao=w)L

literal 0
HcmV?d00001

diff --git a/tests/data/Shared/OLERead/document b/tests/data/Shared/OLERead/document
new file mode 100755
index 00000000..e69de29b
diff --git a/tests/data/Shared/OLERead/summary b/tests/data/Shared/OLERead/summary
new file mode 100755
index 00000000..e69de29b
diff --git a/tests/data/Shared/OLERead/wrkbook b/tests/data/Shared/OLERead/wrkbook
new file mode 100755
index 0000000000000000000000000000000000000000..ad344aa550e1c84f4fc61e987052dc0c14479a55
GIT binary patch
literal 3061
zcmds(&2Lmy7{;G_=XN?X?R>UVL^NE2N)$nw8qgRO5HUpBR9g}g<D!;M+fdqCT7d;&
zHtvlAW_E77apeX`q)TIF*FON_U*JL$7ADu<d(M<Qh1RW!_s%_M-uFDud)|+8&b|3u
zMauT*ezDyvt}M^HL1?XNdKAp7efs7rZ`qIneHISudHu@&<mR`5Q>rI8r4`L<N(=h$
zMqkj6U0wys29tO+rzKscf22X@>|aUjdf#lsrnfMh{?DzUf7e@XcEazbH>*40|IhkB
zv4z*Ud_JYadc0%)U-kOOPvc+T1^?PE`23FeEUPkLE$i=U^}+rJ`xX7->hAT`R4?ym
zRuTAt9rT%9^d<B=*$H>S+fLe!|4zTl@3ACFlvpA<4I+Q7Nz^obr)knRP2kVQ#s*ze
ztyZGeNCRkFZSW251ic!_Z8O+(w#=rt=PWoIHVY)jYr{{HmRiV33odq(c1t6TL?i7s
zdeHW?cp8{*v~=gr9Rbit3&jXOo|bzW+T7gK`ue)Q4<l8YnZ){PGwb?VGjjbvv)A?J
zqKywWdy;Rc+HVoQa>h)smuI+F^;2N=38Fp9(fg}Fmv<*wW!p)nu;c)?H>Dw-_rjWf
zwnI)Qt?67h)bIXfs%6)k%pAH`O65?YZug~fMj73!q;jN4hx${wM?JdLo61?v)?2w$
z?p3e8>Y6V{JojtqcwTwk?ZOvS(A`2h-lx88az8$I`&(2|VHdxol9sysDXXmW<<wq9
z6+P^dtE|z{dOBXC8q3909$=4j`!mQ{db=zBy6XC2ugB*?-ZFLtfh*ZYP?qVO5L|zv
zi$eAtSDoB(fX`Fz1&SVp?>Oj?_KLU7Mb7kjE%ICeFyr1ni<(ueQKXCLr#bUi>6buV
zfzEEjK%EK&qngmix`6T^s(?jN6sv0*>>8ZY^k3?Tj&W)nXCX&n5pD>V-F!}GI=s;H
z-qs2B?J@2XU`J@*bnS6q``~5Z<rR$M;u4OnG0m#Hl^2;igO!4UXZa`K?}s13?|Yg*
zsq0#HS*c<p!UkcTBCK;7gJ&7+fky^yUQ5P|GA#Q5)gA`zdg-LKQMi{j3z)6+3GPji
zFU#91Q+P^N&l!^IkN2(harOGRK5z-Pgl{F=ECwv>A+vaa+*>_90%qa+I^^Ku@E9s9
zUKD0n6FC?+6nst;OO$*bbgXC1#~Q~+3x0(vO%d899R=yJUpsy5-uTzi&4DmotgEzB
za6ERD|2A$lw|J+RZxPwP6jrck(k#BmjIYqnp_!#MzpS@l4YA$Yq6;W?W7A;Qh{5Kz
z^ju-CH?Tg<J%ePnZFWN()fY%UH+i3%Pk}Dth%Z6DQ-b)=p;NvD2j~hwIi%7Ok7H|v
zg>Cy{wL>jDDY!rGe8KymQl1H1T;{g0j2eVlYS(A$DSVk3`hoFkJA*S;D9imCuxXc9
zUs+G-XIn<0?eroP-jbs(2~o(>MKwel40jNvEyR?rp&DSU1cJpn?DmoEg(y6Ntuja!
z?T6s3;C_`^ACo>SiTUme;oT@Z&xfH_pz>j7?+k<an)s7q(M97=2K!=NU?q5Z#nEj;
zRH2g}`+&R#*_NRd%EPJ-b^urn7!^3r@Ks==I!n7uhWwWE@EYICQCJ5)0GtGS*jemt
zSsZYXgFps>a2icI3zq<_VsVVDUuLzZB^uN|Y#xSSXDo-nR-jw?h&2iPGR`b?iszlF
J<GZ~o{{i`H&oTf2

literal 0
HcmV?d00001