wangxin/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity

in reality we are limited to max sal_Int32 here

Browse Source 
so accept that and test if the values were accepted or limited

Change-Id: Iaed5ebc2f12b52055506147c71117a2ad88d28ac
This commit is contained in:
Caolán McNamara
2015-08-24 20:43:37 +01:00
parent 8329eb5e4a
commit 0a76c1fd68
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
filter/qa/cppunit/data/pbm/fail/crash-1.pbm Normal file
View File

@ -0,0 +1,6 @@
P3
30000000000000000000000000000000 1
255
103 79 59
95 7P 55
87 67 51

11
filter/source/graphicfilter/ipbm/ipbm.cxx
View File

@ -37,7 +37,7 @@ private:
sal_uLong mnMode; // 0->PBM, 1->PGM, 2->PPM
Bitmap maBmp;
BitmapWriteAccess* mpAcc;
sal_uLong mnWidth, mnHeight; // dimensions in pixel
sal_Int32 mnWidth, mnHeight; // dimensions in pixel
sal_uLong mnCol;
sal_uLong mnMaxVal; // max value in the <missing comment>
bool ImplReadBody();
@ -83,7 +83,7 @@ bool PBMReader::ReadPBM(Graphic & rGraphic )
if ( !( mbStatus = ImplReadHeader() ) )
return false;
if ( ( mnMaxVal == 0 ) || ( mnWidth == 0 ) || ( mnHeight == 0 ) )
if ( ( mnMaxVal == 0 ) || ( mnWidth <= 0 ) || ( mnHeight <= 0 ) )
return false;
// 0->PBM, 1->PGM, 2->PPM
@ -91,7 +91,8 @@ bool PBMReader::ReadPBM(Graphic & rGraphic )
{
case 0 :
maBmp = Bitmap( Size( mnWidth, mnHeight ), 1 );
if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == 0 )
mpAcc = maBmp.AcquireWriteAccess();
if (!mpAcc || mpAcc->Width() != mnWidth || mpAcc->Height() != mnHeight)
return false;
mpAcc->SetPaletteEntryCount( 2 );
mpAcc->SetPaletteColor( 0, BitmapColor( 0xff, 0xff, 0xff ) );
@ -242,8 +243,8 @@ bool PBMReader::ImplReadBody()
bool bPara, bFinished = false;
sal_uInt8 nDat = 0, nCount;
sal_uLong nGrey, nRGB[3];
sal_uLong nWidth = 0;
sal_uLong nHeight = 0;
sal_Int32 nWidth = 0;
sal_Int32 nHeight = 0;
if ( mbRaw )
{