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

exception on div by 0

Browse Source 
Change-Id: Id33d6a5e3df5812babd28ebfc65b95ce97219ad3
This commit is contained in:
Caolán McNamara
2015-07-16 10:01:24 +01:00
parent 091f6c3823
commit cf4159e16c
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
filter/qa/cppunit/data/pict/fail/exception-1.pct Normal file
View File

Binary file not shown.

5
filter/source/graphicfilter/ipict/ipict.cxx
View File

@@ -1859,6 +1859,7 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode)
void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile ) void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile )
{ {
try {
sal_uInt16 nOpcode; sal_uInt16 nOpcode;
sal_uInt8 nOneByteOpcode; sal_uInt8 nOneByteOpcode;
sal_uLong nSize, nPercent, nLastPercent; sal_uLong nSize, nPercent, nLastPercent;
@@ -1950,6 +1951,10 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile )
pPict->SetEndian(nOrigNumberFormat); pPict->SetEndian(nOrigNumberFormat);
if (pPict->GetError()) pPict->Seek(nOrigPos); if (pPict->GetError()) pPict->Seek(nOrigPos);
} catch (...)
{
rStreamPict.SetError(SVSTREAM_FILEFORMAT_ERROR);
}
} }
namespace pict { namespace pict {