Zebediah Figura : user32: Free the created icon handle when using LR_COPYFROMRESOURCE.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 97bf2e7e1edcee9600badf4b708bfe2463d2c28a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=97bf2e7e1edcee9600badf4b7...

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Thu Dec 16 11:58:38 2021 -0600

user32: Free the created icon handle when using LR_COPYFROMRESOURCE.

Spotted by John Sullivan.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52207
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/user32/cursoricon.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c
index 582b2612688..d163d1a7360 100644
--- a/dlls/user32/cursoricon.c
+++ b/dlls/user32/cursoricon.c
@@ -3103,6 +3103,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx,
             struct cursoricon_frame *frame;
             struct cursoricon_object *icon;
             int depth = (flags & LR_MONOCHROME) ? 1 : get_display_bpp();
+            HICON resource_icon = NULL;
             ICONINFO info;
             HICON res;
 
@@ -3110,10 +3111,14 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx,
 
             if (icon->rsrc && (flags & LR_COPYFROMRESOURCE))
             {
-                hnd = CURSORICON_Load( icon->module, icon->resname, desiredx, desiredy, depth,
-                                       !icon->is_icon, flags );
+                resource_icon = CURSORICON_Load( icon->module, icon->resname, desiredx,
+                                                 desiredy, depth, !icon->is_icon, flags );
                 release_user_handle_ptr( icon );
-                if (!(icon = get_icon_ptr( hnd ))) return 0;
+                if (!(icon = get_icon_ptr( resource_icon )))
+                {
+                    if (resource_icon) DestroyIcon( resource_icon );
+                    return 0;
+                }
             }
             frame = get_icon_frame( icon, 0 );
 
@@ -3146,6 +3151,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx,
                     {
                         release_icon_frame( icon, frame );
                         release_user_handle_ptr( icon );
+                        if (resource_icon) DestroyIcon( resource_icon );
                         return 0;
                     }
                     stretch_bitmap( info.hbmColor, frame->color, desiredx, desiredy,
@@ -3156,6 +3162,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx,
                         DeleteObject( info.hbmColor );
                         release_icon_frame( icon, frame );
                         release_user_handle_ptr( icon );
+                        if (resource_icon) DestroyIcon( resource_icon );
                         return 0;
                     }
                     stretch_bitmap( info.hbmMask, frame->mask, desiredx, desiredy,
@@ -3168,6 +3175,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx,
                     if (!(info.hbmMask = CreateBitmap( desiredx, desiredy * 2, 1, 1, NULL )))
                     {
                         release_user_handle_ptr( icon );
+                        if (resource_icon) DestroyIcon( resource_icon );
                         return 0;
                     }
                     stretch_bitmap( info.hbmMask, frame->mask, desiredx, desiredy * 2,
@@ -3184,6 +3192,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx,
             release_user_handle_ptr( icon );
 
             if (res && (flags & LR_COPYDELETEORG)) DestroyIcon( hnd );
+            if (resource_icon) DestroyIcon( resource_icon );
             return res;
         }
     }