diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-31 11:04:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-31 11:05:04 +0100 |
| commit | d6eaa8aa5211f1c140d7e9ed27a7fef806b4af3b (patch) | |
| tree | 51f491d95c88a17710e4a6a9e747add14327a688 | |
| parent | 473066c526ac1d970658b39381436b23d78676ac (diff) | |
ofz: 0 bitcount bmps are unsupported
Change-Id: Ibd7b25546006506350f9fc009596f2989a305a4c
| -rw-r--r-- | vcl/source/gdi/dibtools.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 37408f408154..4cd7c5419199 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -772,6 +772,10 @@ bool ImplReadDIBBody(SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_uL if (!ImplReadDIBInfoHeader(rIStm, aHeader, bTopDown, bMSOFormat) && aHeader.nWidth && aHeader.nHeight && aHeader.nBitCount) return false; + //BI_BITCOUNT_0 jpeg/png is unsupported + if (aHeader.nBitCount == 0) + return false; + // In case ImplReadDIB() didn't call ImplReadDIBFileHeader() before // this method, nOffset is 0, that's OK. if (nOffset && aHeader.nSize > nOffset) |