diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-02-04 01:17:03 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-04 14:58:04 +0100 |
| commit | 28a6558f9d3ca2dda3191f8b5b3f2378ee2533da (patch) | |
| tree | 659674896c7579b94f11a07f239e3e7e2b40a8cb /filter | |
| parent | Fixed incorrect insertion. (diff) | |
| download | core-28a6558f9d3ca2dda3191f8b5b3f2378ee2533da.tar.gz core-28a6558f9d3ca2dda3191f8b5b3f2378ee2533da.zip | |
extract max legal dff length to header
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 8f25ac828f30..5871da971ef9 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3422,6 +3422,8 @@ bool SvxMSDffManager::SeekToRec( SvStream& rSt, sal_uInt16 nRecId, sal_uLong nMa rSt >> aHd; if (!rSt.good()) break; + if (aHd.nRecLen > nMaxLegalDffRecordLength) + break; if ( aHd.nRecType == nRecId ) { if ( nSkipCount ) @@ -6818,8 +6820,6 @@ bool SvxMSDffManager::ReadCommonRecordHeader(DffRecordHeader& rRec, rRec.nRecInstance, rRec.nRecType, rRec.nRecLen); } -sal_uInt32 nMaxLegalRecordLength = SAL_MAX_UINT32 - DFF_COMMON_RECORD_HEADER_SIZE; - /* also static */ bool SvxMSDffManager::ReadCommonRecordHeader(SvStream& rSt, sal_uInt8& rVer, sal_uInt16& rInst, sal_uInt16& rFbt, sal_uInt32& rLength) @@ -6830,7 +6830,7 @@ bool SvxMSDffManager::ReadCommonRecordHeader(SvStream& rSt, rInst = nTmp >> 4; if (!rSt.good()) return false; - if (rLength > nMaxLegalRecordLength) + if (rLength > nMaxLegalDffRecordLength) return false; return true; } |