Resolves: fdo#57532 restrict page sanity check to non-storage chunks

Change-Id: I47c24131e95b9a8a691dbff4710869ba91df8306

Resolves: fdo#57532 restrict page sanity check to non-storage chunks
Change-Id: I47c24131e95b9a8a691dbff4710869ba91df8306
4a104422 · Caolán McNamara · 625ce5e9 · 4a104422 · 4a104422
Kaydet (Commit) 4a104422 authored Ara 05, 2012 tarafından Caolán McNamara
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

fdo57532-1.compound sot/qa/cppunit/data/pass/fdo57532-1.compound +0 -0

stgelem.cxx sot/source/sdstor/stgelem.cxx +1 -1

No files found.
--- a/sot/qa/cppunit/data/pass/fdo57532-1.compound
+++ b/sot/qa/cppunit/data/pass/fdo57532-1.compound
--- 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