diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-12-05 13:16:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-12-05 13:16:32 +0000 |
| commit | 4a1044229afd6b52ca10e5c55f1957b153a8c6ea (patch) | |
| tree | 97339fadf520679b406c864f0cf7871398466382 /sot | |
| parent | 625ce5e92ba1850c841ce591f7bc395243af46a6 (diff) | |
Resolves: fdo#57532 restrict page sanity check to non-storage chunks
Change-Id: I47c24131e95b9a8a691dbff4710869ba91df8306
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/qa/cppunit/data/pass/fdo57532-1.compound | bin | 0 -> 25088 bytes | |||
| -rw-r--r-- | sot/source/sdstor/stgelem.cxx | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sot/qa/cppunit/data/pass/fdo57532-1.compound b/sot/qa/cppunit/data/pass/fdo57532-1.compound Binary files differnew file mode 100644 index 000000000000..70068fe10c89 --- /dev/null +++ b/sot/qa/cppunit/data/pass/fdo57532-1.compound diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index 66734bcfc273..86e4fb827ed6 100644 --- a/sot/source/sdstor/stgelem.cxx +++ b/sot/source/sdstor/stgelem.cxx @@ -389,7 +389,7 @@ sal_Bool StgEntry::Load( const void* pFrom, sal_uInt32 nBufSize ) if (n > nMaxLegalStr) return sal_False; - if ((nSize < 0 && cType != STG_STORAGE) || (nPage1 < 0 && !isKnownSpecial(nPage1))) + if ((cType != STG_STORAGE) && ((nSize < 0) || (nPage1 < 0 && !isKnownSpecial(nPage1)))) { // the size makes no sense for the substorage // TODO/LATER: actually the size should be an unsigned value, but in this case it would mean a stream of more than 2Gb |