shell32: Fix memory leak in ApplicationAssociationRegistration_QueryCurrentDefault.

aba6a680 · Sebastian Lackner · Alexandre Julliard · 3809c7a1 · aba6a680
Commit aba6a680 authored Feb 26, 2015 by Sebastian Lackner Committed by Alexandre Julliard Feb 26, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

assoc.c dlls/shell32/assoc.c +10 -0

No files found.
--- a/dlls/shell32/assoc.c
+++ b/dlls/shell32/assoc.c
@@ -916,6 +916,11 @@ static HRESULT WINAPI ApplicationAssociationRegistration_QueryCurrentDefault(IAp
                    ret = RegGetValueW(hkey, NULL, NULL, RRF_RT_REG_SZ, &keytype, *association, &size);
                    if(ret == ERROR_SUCCESS)
                        hr = S_OK;
+                    else
+                    {
+                        CoTaskMemFree(*association);
+                        *association = NULL;
+                    }
                }
                else
                    hr = E_OUTOFMEMORY;
@@ -952,6 +957,11 @@ static HRESULT WINAPI ApplicationAssociationRegistration_QueryCurrentDefault(IAp
                    ret = RegGetValueW(hkey, path, propid, RRF_RT_REG_SZ, &keytype, *association, &size);
                    if(ret == ERROR_SUCCESS)
                        hr = S_OK;
+                    else
+                    {
+                        CoTaskMemFree(*association);
+                        *association = NULL;
+                    }
                }
                else
                    hr = E_OUTOFMEMORY;