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

[Caolán McNamara]

 vcl/source/gdi/dibtools.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3d21afb8aac5da0139d85498607d40c748b6db53
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 10 11:56:00 2017 +0000

    ofz#787 avoid bmp oom
    
    Change-Id: Id5d1a1b8dd6d4e78bef9d09ab68d1e7daf7e1bd5

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 4fa6cc6..534a50d 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -530,8 +530,9 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
                 rHeader.nSizeImage = rIStm.remainingSize();
             }
 
-            std::unique_ptr<sal_uInt8[]> pBuffer(
-                new sal_uInt8[rHeader.nSizeImage]);
+            if (rHeader.nSizeImage > rIStm.remainingSize())
+                return false;
+            std::unique_ptr<sal_uInt8[]> pBuffer(new sal_uInt8[rHeader.nSizeImage]);
             if (rIStm.ReadBytes(pBuffer.get(), rHeader.nSizeImage)
                 != rHeader.nSizeImage)
             {