diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-11-11 10:19:09 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-11 15:22:08 +0000 |
| commit | 0a272329f3cd82f75d860cff4e851c8e009a5109 (patch) | |
| tree | 7a9c5b2b0dce97b0b803a49af7c9aab5b61d7250 /filter | |
| parent | 00e3da56f2a0698b20b3f72317bfe07f870556f8 (diff) | |
Related: coverity#1242658 Untrusted loop bound
Change-Id: I1e7e815c2800b4846498092239b0fadaa5d87b45
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/graphicfilter/ipict/ipict.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 43cdf5cd17b9..b6e2d77d09a5 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -989,8 +989,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo if ( nRowBytes < 8 || nPackType == 1 ) { const size_t nMaxPixels = pPict->remainingSize() / 4; - const size_t nMaxRows = nMaxPixels / nWidth; - if (nHeight > nMaxRows) + if (static_cast<size_t>(nHeight) * nWidth > nMaxPixels) BITMAPERROR; for ( ny = 0; ny < nHeight; ny++ ) @@ -1006,8 +1005,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo else if ( nPackType == 2 ) { const size_t nMaxPixels = pPict->remainingSize() / 3; - const size_t nMaxRows = nMaxPixels / nWidth; - if (nHeight > nMaxRows) + if (static_cast<size_t>(nHeight) * nWidth > nMaxPixels) BITMAPERROR; for ( ny = 0; ny < nHeight; ny++ ) |