marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Fix a registry key leak.

oldstable
Huw Davies 2015-07-15 12:32:18 +01:00 committed by Alexandre Julliard
parent bebee86da6
commit 4a992fec01
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/msi/action.c
View File

@ -2973,13 +2973,17 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path )
access |= get_registry_view( comp );
if (!(subkey = strdupW( path ))) return;
for (;;)
do
{
if ((p = strrchrW( subkey, '\\' ))) *p = 0;
hkey = open_key( comp, root, subkey, FALSE );
if (!hkey) break;
if (p && p[1])
if ((p = strrchrW( subkey, '\\' )))
{
*p = 0;
if (!p[1]) continue; /* trailing backslash */
hkey = open_key( comp, root, subkey, FALSE );
if (!hkey) break;
res = RegDeleteKeyExW( hkey, p + 1, access, 0 );
RegCloseKey( hkey );
}
else
res = RegDeleteKeyExW( root, subkey, access, 0 );
if (res)
@ -2987,9 +2991,7 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path )
TRACE("failed to delete key %s (%d)\n", debugstr_w(subkey), res);
break;
}
if (p && p[1]) RegCloseKey( hkey );
else break;
}
} while (p);
msi_free( subkey );
}