From 08d49d3e335acb5f9188af827265b955ca430d7b Mon Sep 17 00:00:00 2001 From: Nathan Beckmann Date: Fri, 7 Mar 2008 01:19:03 -0800 Subject: [PATCH] gdiplus: Fix memory leak in GdipLockBitmapBits. --- dlls/gdiplus/image.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 700919763d9..6b827bac9ca 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -170,8 +170,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, bitmap->lockmode = flags; bitmap->numlocks++; - if(flags & ImageLockModeWrite) - bitmap->bitmapbits = buff; + bitmap->bitmapbits = buff; return Ok; } @@ -198,7 +197,8 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, if(!(--bitmap->numlocks)) bitmap->lockmode = 0; - GdipFree(lockeddata->Scan0); + GdipFree(bitmap->bitmapbits); + bitmap->bitmapbits = NULL; return Ok; } @@ -225,6 +225,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, } GdipFree(bitmap->bitmapbits); + bitmap->bitmapbits = NULL; return Ok; } @@ -426,6 +427,8 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) IPicture_get_CurDC(image->picture, &hdc); DeleteDC(hdc); IPicture_Release(image->picture); + if (image->type == ImageTypeBitmap) + GdipFree(((GpBitmap*)image)->bitmapbits); GdipFree(image); return Ok; -- 2.11.4.GIT