mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check stream status more often

Browse Source 
Change-Id: I233c2fff9c06a81117f8114ccee83b53ea4026db
This commit is contained in:
Caolán McNamara 2015-09-11 15:38:01 +01:00
parent ab4bb0c0dd
commit b43e03353a
2 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
filter/qa/cppunit/data/ras/fail/hang-1.ras Normal file
View File

Binary file not shown.

47
filter/source/graphicfilter/iras/iras.cxx
View File

@ -222,31 +222,43 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc)
case 1 : case 1 :
for (y = 0; y < mnHeight && mbStatus; ++y) for (y = 0; y < mnHeight && mbStatus; ++y)
{ {
for ( x = 0; x < mnWidth; x++ ) for (x = 0; x < mnWidth && mbStatus; ++x)
{ {
if (!(x & 7)) if (!(x & 7))
{
nDat = ImplGetByte(); nDat = ImplGetByte();
if (!m_rRAS.good())
mbStatus = false;
}
pAcc->SetPixelIndex( y, x, pAcc->SetPixelIndex( y, x,
sal::static_int_cast< sal_uInt8 >( sal::static_int_cast< sal_uInt8 >(
nDat >> ( ( x & 7 ) ^ 7 )) ); nDat >> ( ( x & 7 ) ^ 7 )) );
} }
if (!( ( x - 1 ) & 0x8 ) ) ImplGetByte(); // WORD ALIGNMENT ??? if (!( ( x - 1 ) & 0x8 ) )
if (!m_rRAS.good()) {
mbStatus = false; ImplGetByte(); // WORD ALIGNMENT ???
if (!m_rRAS.good())
mbStatus = false;
}
} }
break; break;
case 8 : case 8 :
for (y = 0; y < mnHeight && mbStatus; ++y) for (y = 0; y < mnHeight && mbStatus; ++y)
{ {
for ( x = 0; x < mnWidth; x++ ) for (x = 0; x < mnWidth && mbStatus; ++x)
{ {
nDat = ImplGetByte(); nDat = ImplGetByte();
pAcc->SetPixelIndex( y, x, nDat ); pAcc->SetPixelIndex( y, x, nDat );
if (!m_rRAS.good())
mbStatus = false;
}
if ( x & 1 )
{
ImplGetByte(); // WORD ALIGNMENT ???
if (!m_rRAS.good())
mbStatus = false;
} }
if ( x & 1 ) ImplGetByte(); // WORD ALIGNMENT ???
if (!m_rRAS.good())
mbStatus = false;
} }
break; break;
@ -257,7 +269,7 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc)
case 24 : case 24 :
for (y = 0; y < mnHeight && mbStatus; ++y) for (y = 0; y < mnHeight && mbStatus; ++y)
{ {
for ( x = 0; x < mnWidth; x++ ) for (x = 0; x < mnWidth && mbStatus; ++x)
{ {
if ( mnType == RAS_TYPE_RGB_FORMAT ) if ( mnType == RAS_TYPE_RGB_FORMAT )
{ {
@ -272,17 +284,22 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc)
nRed = ImplGetByte(); nRed = ImplGetByte();
} }
pAcc->SetPixel ( y, x, BitmapColor( nRed, nGreen, nBlue ) ); pAcc->SetPixel ( y, x, BitmapColor( nRed, nGreen, nBlue ) );
if (!m_rRAS.good())
mbStatus = false;
}
if ( x & 1 )
{
ImplGetByte(); // WORD ALIGNMENT ???
if (!m_rRAS.good())
mbStatus = false;
} }
if ( x & 1 ) ImplGetByte(); // WORD ALIGNMENT ???
if (!m_rRAS.good())
mbStatus = false;
} }
break; break;
case 32 : case 32 :
for (y = 0; y < mnHeight && mbStatus; ++y) for (y = 0; y < mnHeight && mbStatus; ++y)
{ {
for ( x = 0; x < mnWidth; x++ ) for (x = 0; x < mnWidth && mbStatus; ++x)
{ {
nDat = ImplGetByte(); // pad byte > nil nDat = ImplGetByte(); // pad byte > nil
if ( mnType == RAS_TYPE_RGB_FORMAT ) if ( mnType == RAS_TYPE_RGB_FORMAT )
@ -298,9 +315,9 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc)
nRed = ImplGetByte(); nRed = ImplGetByte();
} }
pAcc->SetPixel ( y, x, BitmapColor( nRed, nGreen, nBlue ) ); pAcc->SetPixel ( y, x, BitmapColor( nRed, nGreen, nBlue ) );
if (!m_rRAS.good())
mbStatus = false;
} }
if (!m_rRAS.good())
mbStatus = false;
} }
break; break;
} }