ofz: reject broken rle bmps

Change-Id: I1354d4aa4d7e46cd3bf463e3350071aad3ff5674

ofz: reject broken rle bmps
Change-Id: I1354d4aa4d7e46cd3bf463e3350071aad3ff5674
f25cdaf6 · Caolán McNamara · 2cc5f18d · f25cdaf6 · f25cdaf6
Kaydet (Commit) f25cdaf6 authored Mar 14, 2017 tarafından Caolán McNamara
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

afl-sample-bad-rle-1.bmp ...unit/graphicfilter/data/bmp/fail/afl-sample-bad-rle-1.bmp +0 -0

dibtools.cxx vcl/source/gdi/dibtools.cxx +2 -1

No files found.
--- a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/afl-sample-bad-rle-1.bmp
+++ b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/afl-sample-bad-rle-1.bmp
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -538,7 +538,8 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
            {
                return false;
            }
-            ImplDecodeRLE(pBuffer.get(), rHeader, rAcc, RLE_4 == rHeader.nCompression);
+            if (!ImplDecodeRLE(pBuffer.get(), rHeader, rAcc, RLE_4 == rHeader.nCompression))
+                return false;
        }
        else
        {