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

ofz#3750 Undefined-shift

Browse Source 
Change-Id: If227dea7758c22cadfad83192e0ad31a4183b5b5
Reviewed-on: https://gerrit.libreoffice.org/43747
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2017-10-24 10:49:06 +01:00
parent 0b47baca10
commit d5a37cd8af
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vcl/source/gdi/dibtools.cxx
View File

@@ -773,13 +773,16 @@ bool ImplReadDIBBody(SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_uL
const sal_uLong nStmPos = rIStm.Tell(); const sal_uLong nStmPos = rIStm.Tell();
bool bTopDown(false); bool bTopDown(false);
if (!ImplReadDIBInfoHeader(rIStm, aHeader, bTopDown, bMSOFormat) && aHeader.nWidth && aHeader.nHeight && aHeader.nBitCount) if (!ImplReadDIBInfoHeader(rIStm, aHeader, bTopDown, bMSOFormat))
return false; return false;
//BI_BITCOUNT_0 jpeg/png is unsupported //BI_BITCOUNT_0 jpeg/png is unsupported
if (aHeader.nBitCount == 0) if (aHeader.nBitCount == 0)
return false; return false;
if (aHeader.nWidth <= 0 || aHeader.nHeight <= 0)
return false;
// In case ImplReadDIB() didn't call ImplReadDIBFileHeader() before // In case ImplReadDIB() didn't call ImplReadDIBFileHeader() before
// this method, nOffset is 0, that's OK. // this method, nOffset is 0, that's OK.
if (nOffset && aHeader.nSize > nOffset) if (nOffset && aHeader.nSize > nOffset)