Skip to content

W
wine-winehq
Commit cfc4082b authored by Carlos's avatar Carlos Committed by Alexandre Julliard
Browse files
Options

Avoid crashes when ofnW->lpstrFile is null.

parent 618c1841
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
dlls/commdlg/filedlg.c
View file @ cfc4082b
......@@ -669,8 +669,8 @@ void FILEDLG_UpdateResult(LFSPRIVATE lfs, WCHAR *tmpstr)
LPOPENFILENAME16 ofn16 = lfs->ofn16;
char *dest = MapSL(ofn16->lpstrFile);
if (!WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFile, -1,
tmp, ofnW->nMaxFile, NULL, NULL ))
tmp[ofnW->nMaxFile-1] = 0;
tmp, sizeof(tmp), NULL, NULL ))
tmp[sizeof(tmp)-1] = 0;
GetShortPathNameA(tmp, dest, ofn16->nMaxFile);
/* the same procedure as every year... */
......@@ -685,7 +685,8 @@ void FILEDLG_UpdateResult(LFSPRIVATE lfs, WCHAR *tmpstr)
}
if (lfs->ofnA)
{
if (!WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFile, -1,
if (ofnW->nMaxFile &&
!WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFile, -1,
lfs->ofnA->lpstrFile, ofnW->nMaxFile, NULL, NULL ))
lfs->ofnA->lpstrFile[ofnW->nMaxFile-1] = 0;
lfs->ofnA->nFileOffset = ofnW->nFileOffset;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment