Kaydet (Commit) e5e13192 authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#1242632 Untrusted loop bound

Change-Id: Ib821adfbca149091d4fbe52d05837e232c3caf55
üst 41029bcd
...@@ -1266,9 +1266,18 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) ...@@ -1266,9 +1266,18 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
rtl_TextEncoding eSrcEncoding = GetSOLoadTextEncoding( (rtl_TextEncoding)nCharSet ); rtl_TextEncoding eSrcEncoding = GetSOLoadTextEncoding( (rtl_TextEncoding)nCharSet );
// The number of paragraphs ... // The number of paragraphs ...
sal_uInt16 nParagraphs; sal_uInt16 nParagraphs(0);
rIStream.ReadUInt16( nParagraphs ); rIStream.ReadUInt16( nParagraphs );
const size_t nMinParaRecordSize = 6 + eSrcEncoding == RTL_TEXTENCODING_UNICODE ? 4 : 2;
const size_t nMaxParaRecords = rIStream.remainingSize() / nMinParaRecordSize;
if (nParagraphs > nMaxParaRecords)
{
SAL_WARN("editeng", "Parsing error: " << nMaxParaRecords <<
" max possible entries, but " << nParagraphs<< " claimed, truncating");
nParagraphs = nMaxParaRecords;
}
// The individual paragraphs ... // The individual paragraphs ...
for ( sal_uLong nPara = 0; nPara < nParagraphs; nPara++ ) for ( sal_uLong nPara = 0; nPara < nParagraphs; nPara++ )
{ {
...@@ -1280,7 +1289,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) ...@@ -1280,7 +1289,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
// StyleName and Family... // StyleName and Family...
pC->GetStyle() = rIStream.ReadUniOrByteString(eSrcEncoding); pC->GetStyle() = rIStream.ReadUniOrByteString(eSrcEncoding);
sal_uInt16 nStyleFamily; sal_uInt16 nStyleFamily(0);
rIStream.ReadUInt16( nStyleFamily ); rIStream.ReadUInt16( nStyleFamily );
pC->GetFamily() = (SfxStyleFamily)nStyleFamily; pC->GetFamily() = (SfxStyleFamily)nStyleFamily;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment