Fixed crash in open file dialog on non-windows 98 emulation when

lpszInitialDir is null.

Fixed crash in open file dialog on non-windows 98 emulation when
07e26347 · Jason Edmeades · Alexandre Julliard · 99b33074 · 07e26347
Commit 07e26347 authored Jun 25, 2002 by Jason Edmeades Committed by Alexandre Julliard Jun 25, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

filedlg95.c dlls/commdlg/filedlg95.c +8 -1

No files found.
--- a/dlls/commdlg/filedlg95.c
+++ b/dlls/commdlg/filedlg95.c
@@ -1124,7 +1124,14 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
         if (result) {
            strcpy(fodInfos->ofnInfos->lpstrFile, nameBit);
            *nameBit = 0x00;
-            strcpy((LPSTR) fodInfos->ofnInfos->lpstrInitialDir, tmpBuf);
+            if (fodInfos->ofnInfos->lpstrInitialDir == NULL) {
+                initDir = MemAlloc(strlen(tmpBuf) + 1);
+                fodInfos->ofnInfos->lpstrInitialDir = initDir;
+                strcpy(initDir, tmpBuf);
+                handledPath = TRUE;
+            } else {
+               strcpy((LPSTR)fodInfos->ofnInfos->lpstrInitialDir, tmpBuf);
+            }
            handledPath = TRUE;
            TRACE("Value in lpstrFile includes path, overriding lpstrInitialDir: %s, %s\n", 
                 fodInfos->ofnInfos->lpstrFile, fodInfos->ofnInfos->lpstrInitialDir);