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

Resolves: ofz#547 Floating-point-exception

Browse Source 
Change-Id: I9612bef0198ce8f09d39f5000a31819c175027d1
This commit is contained in:
Caolán McNamara 2017-02-06 09:27:15 +00:00
parent c9c3cb5446
commit bac4b46e86
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -930,7 +930,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo
if (nRowBytes < 8 || nPackType == 1) if (nRowBytes < 8 || nPackType == 1)
{ {
if (nHeight > pPict->remainingSize() / (sizeof(sal_uInt16) * nWidth)) if (nWidth && nHeight > pPict->remainingSize() / (sizeof(sal_uInt16) * nWidth))
return 0xffffffff; return 0xffffffff;
} }
else else
@ -1030,10 +1030,10 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo
if ( nRowBytes < 8 || nPackType == 1 ) if ( nRowBytes < 8 || nPackType == 1 )
{ {
const size_t nMaxPixels = pPict->remainingSize() / 4; const size_t nMaxPixels = pPict->remainingSize() / 4;
const size_t nMaxRows = nMaxPixels / nWidth; const size_t nMaxRows = nWidth ? nMaxPixels / nWidth : SAL_MAX_UINT16;
if (nHeight > nMaxRows) if (nHeight > nMaxRows)
return 0xffffffff; return 0xffffffff;
const size_t nMaxCols = nMaxPixels / nHeight; const size_t nMaxCols = nHeight ? nMaxPixels / nHeight : SAL_MAX_UINT16;
if (nWidth > nMaxCols) if (nWidth > nMaxCols)
return 0xffffffff; return 0xffffffff;
@ -1053,10 +1053,10 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo
else if ( nPackType == 2 ) else if ( nPackType == 2 )
{ {
const size_t nMaxPixels = pPict->remainingSize() / 3; const size_t nMaxPixels = pPict->remainingSize() / 3;
const size_t nMaxRows = nMaxPixels / nWidth; const size_t nMaxRows = nWidth ? nMaxPixels / nWidth : SAL_MAX_UINT16;
if (nHeight > nMaxRows) if (nHeight > nMaxRows)
return 0xffffffff; return 0xffffffff;
const size_t nMaxCols = nMaxPixels / nHeight; const size_t nMaxCols = nMaxPixels ? nMaxPixels / nHeight : SAL_MAX_UINT16;
if (nWidth > nMaxCols) if (nWidth > nMaxCols)
return 0xffffffff; return 0xffffffff;