diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-30 17:01:23 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-09-30 20:30:27 +0000 |
| commit | 82f88758f2a7309743c473ce976c8a703a09a4c0 (patch) | |
| tree | 7560291a809ff1a17bbd4cb222cebc9fc698b9f4 /sc | |
| parent | d14c7b034d75730a85b5f6f843e39ff79840c272 (diff) | |
don't believe xls wrt size to reserve
Change-Id: Id9864f199e270d13d801348b12f1e94dd80558c7
(cherry picked from commit 358ca9eaa3d85236047a7a2781e38f57209c2858)
Reviewed-on: https://gerrit.libreoffice.org/19042
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/unit/data/xls/pass/crash-1.xls | bin | 0 -> 4096 bytes | |||
| -rw-r--r-- | sc/source/filter/excel/xicontent.cxx | 11 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sc/qa/unit/data/xls/pass/crash-1.xls b/sc/qa/unit/data/xls/pass/crash-1.xls Binary files differnew file mode 100644 index 000000000000..724bfc1a6f14 --- /dev/null +++ b/sc/qa/unit/data/xls/pass/crash-1.xls diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 3d166cb1a89d..96130197302b 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -75,10 +75,15 @@ XclImpSst::XclImpSst( const XclImpRoot& rRoot ) : void XclImpSst::ReadSst( XclImpStream& rStrm ) { rStrm.Ignore( 4 ); - sal_uInt32 nStrCount(0); - nStrCount = rStrm.ReaduInt32(); + sal_uInt32 nStrCount = rStrm.ReaduInt32(); + auto nBytesAvailable = rStrm.GetRecLeft(); + if (nStrCount > nBytesAvailable) + { + SAL_WARN("sc.filter", "xls claimed to have " << nStrCount << " strings, but only " << nBytesAvailable << " bytes available, truncating"); + nStrCount = nBytesAvailable; + } maStrings.clear(); - maStrings.reserve( static_cast< size_t >( nStrCount ) ); + maStrings.reserve(nStrCount); while( (nStrCount > 0) && rStrm.IsValid() ) { XclImpString aString; |