Hans Leidekker : msi: Avoid a crash in RemoveFiles if the component directory is invalid.

Alexandre Julliard julliard at winehq.org
Wed May 15 14:32:22 CDT 2019


Module: wine
Branch: stable
Commit: 8ebf718134ad9744354a87c9f964e8f7766dedf4
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8ebf718134ad9744354a87c9f964e8f7766dedf4

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Mon Mar 25 21:12:04 2019 +0100

msi: Avoid a crash in RemoveFiles if the component directory is invalid.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46907
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit c7f323107b3b956d206d8d0ee28851d60f19841c)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/msi/files.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 5a88c14..07f737d 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -1444,7 +1444,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package )
         else
         {
             MSIFOLDER *folder = msi_get_loaded_folder( package, comp->Directory );
-            remove_folder( folder );
+            if (folder) remove_folder( folder );
         }
     }
     return ERROR_SUCCESS;




More information about the wine-cvs mailing list