Skip to content

C
core
Kaydet (Commit) 5a69d3af authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

coverity#736887 Unintended sign extension 

also

coverity#736888
coverity#736889
coverity#736890

Change-Id: I3e0d11d12c7da17297ba827f8125b9d99680121b
üst da69c763
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 10 deletions
sc/source/filter/excel/excform.cxx
Dosyayı görüntüle @ 5a69d3af
......@@ -975,8 +975,8 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
break;
case 0x19: // Special Attribute [327 279]
{
sal_uInt16 nData, nFakt;
sal_uInt8 nOpt;
sal_uInt16 nData(0), nFakt(0);
sal_uInt8 nOpt(0);
aIn >> nOpt;
......@@ -992,9 +992,10 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
}
if( nOpt & 0x04 )
{// nFakt -> skip bytes or words AttrChoose
nData++;
aIn.Ignore( nData * nFakt );
{
// nFakt -> skip bytes or words AttrChoose
++nData;
aIn.Ignore(static_cast<sal_Size>(nData) * nFakt);
}
}
break;
......
sc/source/filter/excel/excform8.cxx
Dosyayı görüntüle @ 5a69d3af
......@@ -993,16 +993,17 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
break;
case 0x19: // Special Attribute [327 279]
{
sal_uInt16 nData, nFakt;
sal_uInt8 nOpt;
sal_uInt16 nData(0), nFakt(0);
sal_uInt8 nOpt(0);
aIn >> nOpt >> nData;
nFakt = 2;
if( nOpt & 0x04 )
{// nFakt -> skip bytes or words AttrChoose
nData++;
aIn.Ignore( nData * nFakt );
{
// nFakt -> skip bytes or words AttrChoose
++nData;
aIn.Ignore(static_cast<sal_Size>(nData) * nFakt);
}
}
break;
......
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