summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sot/qa/cppunit/data/pass/fdo57532-1.compoundbin0 -> 25088 bytes
-rw-r--r--sot/source/sdstor/stgelem.cxx2
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
new file mode 100644
index 000000000000..70068fe10c89
--- /dev/null
+++ b/sot/qa/cppunit/data/pass/fdo57532-1.compound
Binary files differ
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