sot/qa/cppunit/data/pass/fdo57532-1.compound |binary sot/source/sdstor/stgelem.cxx | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-)
New commits: commit 4a1044229afd6b52ca10e5c55f1957b153a8c6ea Author: Caolán McNamara <[email protected]> Date: Wed Dec 5 13:16:32 2012 +0000 Resolves: fdo#57532 restrict page sanity check to non-storage chunks Change-Id: I47c24131e95b9a8a691dbff4710869ba91df8306 diff --git a/sot/qa/cppunit/data/pass/fdo57532-1.compound b/sot/qa/cppunit/data/pass/fdo57532-1.compound new file mode 100644 index 0000000..70068fe Binary files /dev/null and b/sot/qa/cppunit/data/pass/fdo57532-1.compound differ diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index 66734bc..86e4fb8 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
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
