[Libreoffice-commits] core.git: vcl/qa vcl/source

[Caolán McNamara]

 dev/null                                                            |binary
 vcl/qa/cppunit/graphicfilter/data/bmp/fail/afl-sample-bad-rle-1.bmp |binary
 vcl/source/gdi/dibtools.cxx                                         |    3 ++-
 3 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f25cdaf6cba85a6a161755fe5f8067e479ab0414
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 14 11:18:35 2017 +0000

    ofz: reject broken rle bmps
    
    Change-Id: I1354d4aa4d7e46cd3bf463e3350071aad3ff5674

diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/afl-sample-bad-rle-1.bmp b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/afl-sample-bad-rle-1.bmp
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/bmp/pass/afl-sample-bad-rle-1.bmp
rename to vcl/qa/cppunit/graphicfilter/data/bmp/fail/afl-sample-bad-rle-1.bmp
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 534a50d..1559a6a 100644
--- 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
         {