From 4ba3b0aa0b909f5b4fef51559af3cc64e09dee2d Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Tue, 30 Sep 2003 00:22:33 +0000
Subject: [PATCH] Fix memory leaks on error path.

---
 dlls/commdlg/colordlg.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/dlls/commdlg/colordlg.c b/dlls/commdlg/colordlg.c
index 41645467568..1db25b25b3e 100644
--- a/dlls/commdlg/colordlg.c
+++ b/dlls/commdlg/colordlg.c
@@ -816,14 +816,15 @@ LONG CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam, BOOL b16 )
    {
        CHOOSECOLORW *ch32;
        CHOOSECOLOR16 *ch16 = (CHOOSECOLOR16 *) lParam;
-       ch32 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CHOOSECOLORW) );
-       lpp->lpcc = ch32;
-       lpp->lpcc16 = ch16;
-       if (lpp->lpcc16->lStructSize != sizeof(CHOOSECOLOR16) )
+       if (ch16->lStructSize != sizeof(CHOOSECOLOR16) )
        {
+           HeapFree(GetProcessHeap(), 0, lpp);
            EndDialog (hDlg, 0) ;
            return FALSE;
        }
+       ch32 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CHOOSECOLORW) );
+       lpp->lpcc = ch32;
+       lpp->lpcc16 = ch16;
        ch32->lStructSize = sizeof(CHOOSECOLORW);
        ch32->hwndOwner = HWND_32(ch16->hwndOwner);
        /* Should be an HINSTANCE but MS made a typo */
@@ -833,12 +834,14 @@ LONG CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam, BOOL b16 )
        ch32->Flags = ch16->Flags;
    }
    else
-       lpp->lpcc = (LPCHOOSECOLORW) lParam;
-
-   if (lpp->lpcc->lStructSize != sizeof(CHOOSECOLORW) )
    {
-      EndDialog (hDlg, 0) ;
-      return FALSE;
+       lpp->lpcc = (LPCHOOSECOLORW) lParam;
+       if (lpp->lpcc->lStructSize != sizeof(CHOOSECOLORW) )
+       {
+           HeapFree(GetProcessHeap(), 0, lpp);
+           EndDialog (hDlg, 0) ;
+           return FALSE;
+       }
    }
    SetWindowLongA(hDlg, DWL_USER, (LONG)lpp);
 
-- 
2.11.4.GIT