comdlg32: Avoid crash when a path is passed into Open File Dialog.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comdlg32: Avoid crash when a path is passed into Open File Dialog.
58091188 · Bruno Jesus · Alexandre Julliard · 0414332b · 58091188
Commit 58091188 authored Oct 27, 2016 by Bruno Jesus Committed by Alexandre Julliard Oct 27, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

filedlg.c dlls/comdlg32/filedlg.c +9 -3

No files found.
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -1565,10 +1565,16 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
         result = GetFullPathNameW(fodInfos->filename, MAX_PATH, tmpBuf, &nameBit);
         if (result) {

-            /* nameBit is always shorter than the original filename */
-            lstrcpyW(fodInfos->filename,nameBit);
+            /* nameBit is always shorter than the original filename. It may be NULL
+             * when the filename contains only a drive name instead of file name */
+            if (nameBit)
+            {
+                lstrcpyW(fodInfos->filename,nameBit);
+                *nameBit = 0x00;
+            }
+            else
+                *fodInfos->filename = '\0';

-            *nameBit = 0x00;
            MemFree(fodInfos->initdir);
            fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf) + 1)*sizeof(WCHAR));
            lstrcpyW(fodInfos->initdir, tmpBuf);