Alex Henrie : comdlg32: Don' t crash if an IShellFolder could not be created.

Alexandre Julliard julliard at winehq.org
Thu Apr 20 12:35:12 CDT 2017


Module: wine
Branch: stable
Commit: 0a2abcee3d76f1e88cbb21c7f9d542a8e2d5c6a3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0a2abcee3d76f1e88cbb21c7f9d542a8e2d5c6a3

Author: Alex Henrie <alexhenrie24 at gmail.com>
Date:   Tue Feb 14 00:00:48 2017 -0700

comdlg32: Don't crash if an IShellFolder could not be created.

Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit e07d20f3f39220d5f1d2a2e5c85cc4d624060f2f)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/comdlg32/filedlg.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
index d0d00b3..bcae7d3 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -2951,7 +2951,8 @@ static void FILEDLG95_SHELL_Clean(HWND hwnd)
       IShellView_DestroyViewWindow(fodInfos->Shell.FOIShellView);
       IShellView_Release(fodInfos->Shell.FOIShellView);
     }
-    IShellFolder_Release(fodInfos->Shell.FOIShellFolder);
+    if (fodInfos->Shell.FOIShellFolder)
+      IShellFolder_Release(fodInfos->Shell.FOIShellFolder);
     IShellBrowser_Release(fodInfos->Shell.FOIShellBrowser);
     if (fodInfos->Shell.FOIDataObject)
       IDataObject_Release(fodInfos->Shell.FOIDataObject);




More information about the wine-cvs mailing list