diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-20 13:42:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-20 13:42:13 +0000 |
| commit | 8d6169cf83d2063d4aa6b7399cc97b3037c973f7 (patch) | |
| tree | 8283b8d705795b0ecbd08fd861e90640964588b3 /sot | |
| parent | f679d4000c97ecb784863b7c7dfe09ace18646f3 (diff) | |
INTEGRATION: CWS fwk89_DEV300 (1.9.50.1.2); FILE MERGED
2008/04/23 15:47:48 mav 1.9.50.1.2.1: #i87635# the size has no sence for substorages
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/source/sdstor/stgelem.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index b85341c92399..5c0a7a009e94 100644 --- a/sot/source/sdstor/stgelem.cxx +++ b/sot/source/sdstor/stgelem.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: stgelem.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -383,8 +383,9 @@ BOOL StgEntry::Load( const void* pFrom ) UINT16 n = nNameLen; if( n ) n = ( n >> 1 ) - 1; - if( n > 31 || nSize < 0 ) + if( n > 31 || nSize < 0 && cType != STG_STORAGE ) { + // the size makes no sence 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 return FALSE; } |