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

Resolves: #i123478# Secure mem freeing for BitmapBuffer class

Browse Source 
(cherry picked from commit dd1cb9aa9ea24b6c89de05e6c5deae7951b78feb)

Change-Id: I7a63835d1e93f4cebc0f908d01873ea3ff91fe66
This commit is contained in:
Armin Le Grand
2013-10-21 10:33:16 +00:00
committed by Caolán McNamara
parent 6e03e292e5
commit 1ba10fb55a
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -354,6 +354,9 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap()
if(pExtraRGB) if(pExtraRGB)
{ {
// #i123478# shockingly, BitmapBuffer does not free the memory it is controlling
// in it's destructor, this *has to be done handish*. Doing it here now
delete[] pExtraRGB->mpBits;
delete pExtraRGB; delete pExtraRGB;
} }
else else
@@ -492,6 +495,9 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlph
if(pExtraA) if(pExtraA)
{ {
// #i123478# shockingly, BitmapBuffer does not free the memory it is controlling
// in it's destructor, this *has to be done handish*. Doing it here now
delete[] pExtraA->mpBits;
delete pExtraA; delete pExtraA;
} }
else else
@@ -506,6 +512,9 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlph
if(pExtraRGB) if(pExtraRGB)
{ {
// #i123478# shockingly, BitmapBuffer does not free the memory it is controlling
// in it's destructor, this *has to be done handish*. Doing it here now
delete[] pExtraRGB->mpBits;
delete pExtraRGB; delete pExtraRGB;
} }
else else