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

ofz#882: test available len against max possible compression

Browse Source 
Change-Id: I19867b74d860f379eae17916cc7f6415e6d20074
This commit is contained in:
Caolán McNamara
2017-03-16 16:35:41 +00:00
parent 5885a5da36
commit ea8a1bda45
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vcl/source/gdi/pngread.cxx
View File

@@ -596,6 +596,16 @@ bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
if ( nScansize64 > SAL_MAX_UINT32 ) if ( nScansize64 > SAL_MAX_UINT32 )
return false; return false;
// assume max theoretical compression of 1:1032
sal_uInt64 nMinSizeRequired = (nScansize64 * maOrigSize.Height()) / 1032;
if (nMinSizeRequired > mnStreamSize)
{
SAL_WARN("vcl.gdi", "overlarge png dimensions: " <<
maOrigSize.Width() << " x " << maOrigSize.Height() << " depth: " << (int)mnPngDepth <<
" couldn't be supplied by file length " << mnStreamSize << " at least " << nMinSizeRequired << " needed ");
return false;
}
mnScansize = static_cast< sal_uInt32 >( nScansize64 ); mnScansize = static_cast< sal_uInt32 >( nScansize64 );
// calculate target size from original size and the preview hint // calculate target size from original size and the preview hint