reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-21 05:11:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

comdlg32: Add structure size checks.

Browse Source
This commit is contained in:
Huw Davies 2012-09-21 13:22:51 +01:00 committed by Alexandre Julliard
parent 9db8e593bf
commit 4c47385ea5
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/comdlg32/filedlg.c
View File

@ -4024,6 +4024,12 @@ static void MemFree(void *mem)
HeapFree(GetProcessHeap(),0,mem); HeapFree(GetProcessHeap(),0,mem);
} }
static inline BOOL valid_struct_size( DWORD size )
{
return (size == OPENFILENAME_SIZE_VERSION_400W) ||
(size == sizeof( OPENFILENAMEW ));
}
static inline BOOL is_win16_looks(DWORD flags) static inline BOOL is_win16_looks(DWORD flags)
{ {
return (flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE) && return (flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE) &&
@ -4047,6 +4053,12 @@ BOOL WINAPI GetOpenFileNameA(
{ {
TRACE("flags %08x\n", ofn->Flags); TRACE("flags %08x\n", ofn->Flags);
if (!valid_struct_size( ofn->lStructSize ))
{
COMDLG32_SetCommDlgExtendedError( CDERR_STRUCTSIZE );
return FALSE;
}
/* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */ /* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */
if (ofn->Flags & OFN_FILEMUSTEXIST) if (ofn->Flags & OFN_FILEMUSTEXIST)
ofn->Flags |= OFN_PATHMUSTEXIST; ofn->Flags |= OFN_PATHMUSTEXIST;
@ -4072,6 +4084,12 @@ BOOL WINAPI GetOpenFileNameW(
{ {
TRACE("flags %08x\n", ofn->Flags); TRACE("flags %08x\n", ofn->Flags);
if (!valid_struct_size( ofn->lStructSize ))
{
COMDLG32_SetCommDlgExtendedError( CDERR_STRUCTSIZE );
return FALSE;
}
/* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */ /* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */
if (ofn->Flags & OFN_FILEMUSTEXIST) if (ofn->Flags & OFN_FILEMUSTEXIST)
ofn->Flags |= OFN_PATHMUSTEXIST; ofn->Flags |= OFN_PATHMUSTEXIST;
@ -4096,6 +4114,12 @@ BOOL WINAPI GetOpenFileNameW(
BOOL WINAPI GetSaveFileNameA( BOOL WINAPI GetSaveFileNameA(
LPOPENFILENAMEA ofn) /* [in/out] address of init structure */ LPOPENFILENAMEA ofn) /* [in/out] address of init structure */
{ {
if (!valid_struct_size( ofn->lStructSize ))
{
COMDLG32_SetCommDlgExtendedError( CDERR_STRUCTSIZE );
return FALSE;
}
if (is_win16_looks(ofn->Flags)) if (is_win16_looks(ofn->Flags))
return GetFileName31A(ofn, SAVE_DIALOG); return GetFileName31A(ofn, SAVE_DIALOG);
else else
@ -4115,6 +4139,12 @@ BOOL WINAPI GetSaveFileNameA(
BOOL WINAPI GetSaveFileNameW( BOOL WINAPI GetSaveFileNameW(
LPOPENFILENAMEW ofn) /* [in/out] address of init structure */ LPOPENFILENAMEW ofn) /* [in/out] address of init structure */
{ {
if (!valid_struct_size( ofn->lStructSize ))
{
COMDLG32_SetCommDlgExtendedError( CDERR_STRUCTSIZE );
return FALSE;
}
if (is_win16_looks(ofn->Flags)) if (is_win16_looks(ofn->Flags))
return GetFileName31W(ofn, SAVE_DIALOG); return GetFileName31W(ofn, SAVE_DIALOG);
else else