coverity#735993 Explicit null dereferenced

Change-Id: Ib8b1af5a783a2bae285c24e5153cce4713a2e2dd

1 files changed, 12 insertions, 2 deletions

diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx
index 9bb600ff0a5a..3fc4c3cb5c15 100644
--- a/vcl/source/gdi/salmisc.cxx
+++ b/vcl/source/gdi/salmisc.cxx
@@ -342,7 +342,12 @@ BitmapBuffer* StretchAndConvert(
         ( nDstScanlineFormat == BMP_FORMAT_4BIT_LSN_PAL ) ||
         ( nDstScanlineFormat == BMP_FORMAT_8BIT_PAL ) )
     {
-        DBG_ASSERT( pDstPal, "destination buffer requires palette" );
+        assert(pDstPal && "destination buffer requires palette");
+        if (!pDstPal)
+        {
+            delete pDstBuffer;
+            return NULL;
+        }
         pDstBuffer->maPalette = *pDstPal;
     }
     else if( ( nDstScanlineFormat == BMP_FORMAT_8BIT_TC_MASK ) ||
@@ -351,7 +356,12 @@ BitmapBuffer* StretchAndConvert(
              ( nDstScanlineFormat == BMP_FORMAT_24BIT_TC_MASK ) ||
              ( nDstScanlineFormat == BMP_FORMAT_32BIT_TC_MASK ) )
     {
-        DBG_ASSERT( pDstMask, "destination buffer requires color mask" );
+        assert(pDstMask && "destination buffer requires color mask");
+        if (!pDstMask)
+        {
+            delete pDstBuffer;
+            return NULL;
+        }
         pDstBuffer->maColorMask = *pDstMask;
     }