From 65f7589aabc5ca6e5cdb311580d293c2b9e54de1 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 28 Sep 2015 09:35:23 +0100 Subject: wmf spec says that these are only allowed bitcount values Change-Id: Ia174feec73ee676567a3632d2f88b11c176b6363 (cherry picked from commit b107353addfe35cc40864b7fb5ff4fee42fff6cf) Reviewed-on: https://gerrit.libreoffice.org/18903 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- .../cppunit/graphicfilter/data/wmf/fail/bitcount-1.wmf | Bin 0 -> 1916 bytes vcl/source/gdi/dibtools.cxx | 14 +++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 vcl/qa/cppunit/graphicfilter/data/wmf/fail/bitcount-1.wmf diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/fail/bitcount-1.wmf b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/bitcount-1.wmf new file mode 100644 index 000000000000..2ec88066f527 Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/bitcount-1.wmf differ diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 247ce7c9378a..a018bebcb7c5 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -276,7 +276,19 @@ bool ImplReadDIBInfoHeader(SvStream& rIStm, DIBV5Header& rHeader, bool& bTopDown rHeader.nSizeImage = 0; } - return( ( rHeader.nPlanes == 1 ) && ( rIStm.GetError() == 0UL ) ); + + if (rHeader.nPlanes != 1) + return false; + + if (rHeader.nBitCount != 0 && rHeader.nBitCount != 1 && + rHeader.nBitCount != 4 && rHeader.nBitCount != 8 && + rHeader.nBitCount != 16 && rHeader.nBitCount != 24 && + rHeader.nBitCount != 32) + { + return false; + } + + return rIStm.good(); } bool ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, bool bQuad ) -- cgit v1.2.3