From 7527fdd8736d2a1e1d4c72014e4dbd2e009ea5ee Mon Sep 17 00:00:00 2001 From: George Tasker Date: Sun, 2 Dec 2001 22:54:38 +0000 Subject: [PATCH] Fixed incorrect deletion of hPalette if the call to wxReadDIB() fails git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/dib.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp index f5b86d7c2b..c48d865d23 100644 --- a/src/msw/dib.cpp +++ b/src/msw/dib.cpp @@ -695,14 +695,15 @@ HPALETTE wxMakeDIBPalette(LPBITMAPINFOHEADER lpInfo) bool wxLoadIntoBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette **pal) { - HBITMAP hBitmap; - HPALETTE hPalette; + HBITMAP hBitmap = NULL; + HPALETTE hPalette = NULL; bool success = (wxReadDIB(filename, &hBitmap, &hPalette) != 0); if (!success) { - DeleteObject(hPalette); + if (hPalette) + DeleteObject(hPalette); return FALSE; } -- 2.47.2