Kaydet (Commit) 9d22ab17 authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#735993 Explicit null dereferenced

Change-Id: Ib8b1af5a783a2bae285c24e5153cce4713a2e2dd
üst 7a54951f
...@@ -342,7 +342,12 @@ BitmapBuffer* StretchAndConvert( ...@@ -342,7 +342,12 @@ BitmapBuffer* StretchAndConvert(
( nDstScanlineFormat == BMP_FORMAT_4BIT_LSN_PAL ) || ( nDstScanlineFormat == BMP_FORMAT_4BIT_LSN_PAL ) ||
( nDstScanlineFormat == BMP_FORMAT_8BIT_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; pDstBuffer->maPalette = *pDstPal;
} }
else if( ( nDstScanlineFormat == BMP_FORMAT_8BIT_TC_MASK ) || else if( ( nDstScanlineFormat == BMP_FORMAT_8BIT_TC_MASK ) ||
...@@ -351,7 +356,12 @@ BitmapBuffer* StretchAndConvert( ...@@ -351,7 +356,12 @@ BitmapBuffer* StretchAndConvert(
( nDstScanlineFormat == BMP_FORMAT_24BIT_TC_MASK ) || ( nDstScanlineFormat == BMP_FORMAT_24BIT_TC_MASK ) ||
( nDstScanlineFormat == BMP_FORMAT_32BIT_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; pDstBuffer->maColorMask = *pDstMask;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment