Skip to content

W
wine-winehq
Commit 5dc576b5 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

Fixed off by one allocation errors.

parent 6fe38e56
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
dlls/commdlg/filedlg95.c
View file @ 5dc576b5
...@@ -356,13 +356,13 @@ BOOL WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType) ...@@ -356,13 +356,13 @@ BOOL WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType)
fodInfos->ofnInfos.lpstrFileTitle = (LPSTR)MemAlloc(ofn->nMaxFileTitle); fodInfos->ofnInfos.lpstrFileTitle = (LPSTR)MemAlloc(ofn->nMaxFileTitle);
if (ofn->lpstrInitialDir) if (ofn->lpstrInitialDir)
{ {
fodInfos->ofnInfos.lpstrInitialDir = (LPSTR)MemAlloc(strlen(ofn->lpstrInitialDir)); fodInfos->ofnInfos.lpstrInitialDir = (LPSTR)MemAlloc(strlen(ofn->lpstrInitialDir)+1);
strcpy((LPSTR)fodInfos->ofnInfos.lpstrInitialDir,ofn->lpstrInitialDir); strcpy((LPSTR)fodInfos->ofnInfos.lpstrInitialDir,ofn->lpstrInitialDir);
} }
if (ofn->lpstrTitle) if (ofn->lpstrTitle)
{ {
fodInfos->ofnInfos.lpstrTitle = (LPSTR)MemAlloc(strlen(ofn->lpstrTitle)); fodInfos->ofnInfos.lpstrTitle = (LPSTR)MemAlloc(strlen(ofn->lpstrTitle)+1);
strcpy((LPSTR)fodInfos->ofnInfos.lpstrTitle,ofn->lpstrTitle); strcpy((LPSTR)fodInfos->ofnInfos.lpstrTitle,ofn->lpstrTitle);
} }
...@@ -371,7 +371,7 @@ BOOL WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType) ...@@ -371,7 +371,7 @@ BOOL WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType)
fodInfos->ofnInfos.nFileExtension = ofn->nFileExtension; fodInfos->ofnInfos.nFileExtension = ofn->nFileExtension;
if (ofn->lpstrDefExt) if (ofn->lpstrDefExt)
{ {
fodInfos->ofnInfos.lpstrDefExt = MemAlloc(strlen(ofn->lpstrDefExt)); fodInfos->ofnInfos.lpstrDefExt = MemAlloc(strlen(ofn->lpstrDefExt)+1);
strcpy((LPSTR)fodInfos->ofnInfos.lpstrDefExt,ofn->lpstrDefExt); strcpy((LPSTR)fodInfos->ofnInfos.lpstrDefExt,ofn->lpstrDefExt);
} }
fodInfos->ofnInfos.lCustData = ofn->lCustData; fodInfos->ofnInfos.lCustData = ofn->lCustData;
...@@ -1065,13 +1065,13 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) ...@@ -1065,13 +1065,13 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
} }
else else
{ {
lpstrExt = MemAlloc(strlen(lpstrTemp)-1); lpstrExt = MemAlloc(strlen(lpstrTemp));
strcpy(lpstrExt,&lpstrTemp[1]); strcpy(lpstrExt,&lpstrTemp[1]);
} }
if(!strcmp(&lpstrExt[1],"*") && fodInfos->ofnInfos.lpstrDefExt) if(!strcmp(&lpstrExt[1],"*") && fodInfos->ofnInfos.lpstrDefExt)
{ {
lpstrExt = MemAlloc(strlen(fodInfos->ofnInfos.lpstrDefExt)+1); lpstrExt = MemAlloc(strlen(fodInfos->ofnInfos.lpstrDefExt)+2);
strcat(lpstrExt,"."); strcat(lpstrExt,".");
strcat(lpstrExt,(LPSTR) fodInfos->ofnInfos.lpstrDefExt); strcat(lpstrExt,(LPSTR) fodInfos->ofnInfos.lpstrDefExt);
} }
...@@ -1286,7 +1286,7 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd) ...@@ -1286,7 +1286,7 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd)
if(!lpstrExtTmp) if(!lpstrExtTmp)
break; break;
lpstrExt = (LPSTR) MemAlloc(strlen(lpstrExtTmp)); lpstrExt = (LPSTR) MemAlloc(strlen(lpstrExtTmp)+1);
if(!lpstrExt) if(!lpstrExt)
break; break;
......
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