Related: ofz#318 limit bitmap max to SAL_MAX_INT32

Change-Id: Iae8a0782e5c306f619e0d94a60dfa0d7c00ec54e

Related: ofz#318 limit bitmap max to SAL_MAX_INT32
Change-Id: Iae8a0782e5c306f619e0d94a60dfa0d7c00ec54e
3cbe0047 · Caolán McNamara · 036c1f44 · 3cbe0047
Kaydet (Commit) 3cbe0047 authored Ara 23, 2016 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

svpbmp.cxx vcl/headless/svpbmp.cxx +7 -1

No files found.
--- 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)