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

[Caolán McNamara]

 vcl/headless/svpbmp.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 3cbe00474c373f21b5793915c4919e5c277d2c01
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 23 18:44:47 2016 +0000

    Related: ofz#318 limit bitmap max to SAL_MAX_INT32
    
    Change-Id: Iae8a0782e5c306f619e0d94a60dfa0d7c00ec54e

diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index 10a4596..e7d367a 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -121,9 +121,15 @@ BitmapBuffer* ImplCreateDIB(
         pDIB->maPalette.SetEntryCount( nColors );
     }
 
+    size_t size = pDIB->mnScanlineSize * pDIB->mnHeight;
+    if (size > SAL_MAX_INT32)
+    {
+        delete pDIB;
+        return nullptr;
+    }
+
     try
     {
-        size_t size = pDIB->mnScanlineSize * pDIB->mnHeight;
         pDIB->mpBits = new sal_uInt8[size];
 #ifdef __SANITIZE_ADDRESS__
         if (!pDIB->mpBits)