mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: #i125000# check last status of newly created...

Browse Source 
<Gdiplus::Bitmap> instance before using it.

(cherry picked from commit b127235917610b9c68e19df29bb39af496906569)

Change-Id: I97364cf963424b0e8d0b52b3c995bd4defdca067
This commit is contained in:
Oliver-Rainer Wittmann
2014-06-06 12:07:49 +00:00
committed by Caolán McNamara
parent a10a621b48
commit adb1bb21f8
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vcl/win/source/gdi/salbmp.cxx
View File

@@ -316,6 +316,8 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap()
pRetval = new Gdiplus::Bitmap(nW, nH, PixelFormat24bppRGB); pRetval = new Gdiplus::Bitmap(nW, nH, PixelFormat24bppRGB);
if(pRetval) if(pRetval)
{
if ( pRetval->GetLastStatus() == Gdiplus::Ok )
{ {
sal_uInt8* pSrcRGB(pRGB->mpBits); sal_uInt8* pSrcRGB(pRGB->mpBits);
const sal_uInt32 nExtraRGB(pRGB->mnScanlineSize - (nW * 3)); const sal_uInt32 nExtraRGB(pRGB->mnScanlineSize - (nW * 3));
@@ -336,6 +338,12 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap()
pRetval->UnlockBits(&aGdiPlusBitmapData); pRetval->UnlockBits(&aGdiPlusBitmapData);
} }
else
{
delete pRetval;
pRetval = NULL;
}
}
} }
if(pExtraRGB) if(pExtraRGB)