kernel32: Free the resource data if a matching resource exists and we choose not…

kernel32: Free the resource data if a matching resource exists and we choose not to overwrite the existing resource.

kernel32: Free the resource data if a matching resource exists and we choose not…
9b2af10f · James Hawkins · Alexandre Julliard · 6b403d1a · 9b2af10f
Commit 9b2af10f authored Dec 16, 2009 by James Hawkins Committed by Alexandre Julliard Dec 17, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

resource.c dlls/kernel32/resource.c +5 -2

No files found.
--- a/dlls/kernel32/resource.c
+++ b/dlls/kernel32/resource.c
@@ -810,7 +810,7 @@ static BOOL update_add_resource( QUEUEDUPDATES *updates, LPCWSTR Type, LPCWSTR N
    if (existing)
    {
        if (!overwrite_existing)
-            return TRUE;
+            return FALSE;
        list_remove( &existing->entry );
        HeapFree( GetProcessHeap(), 0, existing );
    }
@@ -1076,7 +1076,10 @@ static BOOL enumerate_mapped_resources( QUEUEDUPDATES *updates,

                resdata = allocate_resource_data( Lang, data->CodePage, p, data->Size, FALSE );
                if (resdata)
-                    update_add_resource( updates, Type, Name, resdata, FALSE );
+                {
+                    if (!update_add_resource( updates, Type, Name, resdata, FALSE ))
+                        HeapFree( GetProcessHeap(), 0, resdata );
+                }
            }
            res_free_str( Name );
        }