kernel32: Fix possible leak of directory handle in RemoveDirectoryW.

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

kernel32: Fix possible leak of directory handle in RemoveDirectoryW.
d638df9f · Sebastian Lackner · Alexandre Julliard · ad83e2cd · d638df9f
Commit d638df9f authored May 03, 2016 by Sebastian Lackner Committed by Alexandre Julliard May 04, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

path.c dlls/kernel32/path.c +9 -3

No files found.
--- a/dlls/kernel32/path.c
+++ b/dlls/kernel32/path.c
@@ -1655,13 +1655,19 @@ BOOL WINAPI RemoveDirectoryW( LPCWSTR path )
    status = NtOpenFile( &handle, DELETE | SYNCHRONIZE, &attr, &io,
                         FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
                         FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT );
-    if (status == STATUS_SUCCESS)
-        status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN, FALSE );
-    RtlFreeUnicodeString( &nt_name );
+    if (status != STATUS_SUCCESS)
+    {
+        SetLastError( RtlNtStatusToDosError(status) );
+        RtlFreeUnicodeString( &nt_name );
+        return FALSE;
+    }

+    status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN, FALSE );
+    RtlFreeUnicodeString( &nt_name );
    if (status != STATUS_SUCCESS)
    {
        SetLastError( RtlNtStatusToDosError(status) );
+        NtClose( handle );
        return FALSE;
    }