Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-11 23:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing another memory crash bug this time for GetFourCCCodes

Browse source 
svn path=/trunk/; revision=26864
This commit is contained in:
Magnus Olsen 2007-05-22 10:46:17 +00:00
parent 2a62b56fd9
commit 3355adf732
2 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
View file

@ -11,6 +11,9 @@
#include "rosdraw.h"
/* PSEH for SEH Support */
#include <pseh/pseh.h>
HRESULT WINAPI
Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface,
REFIID id,
@ -150,26 +153,33 @@ Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD lpNumCodes, LPDWORD
DX_WINDBG_trace();
/* FIXME protect with SEH or something else if lpCodes or lpNumCodes for bad user pointers */
EnterCriticalSection(&ddcs);
// EnterCriticalSection(&ddcs);
if(!lpNumCodes)
_SEH_TRY
{
retVal = DDERR_INVALIDPARAMS;
if(IsBadWritePtr(lpNumCodes,sizeof(LPDWORD)))
{
retVal = DDERR_INVALIDPARAMS;
}
else
{
if(!IsBadWritePtr(lpCodes,sizeof(LPDWORD)))
{
memcpy(lpCodes, This->lpLcl->lpGbl->lpdwFourCC, sizeof(DWORD)* min(This->lpLcl->lpGbl->dwNumFourCC, *lpNumCodes));
}
else
{
*lpNumCodes = This->lpLcl->lpGbl->dwNumFourCC;
}
}
}
else
_SEH_HANDLE
{
if ((lpCodes) && (*lpCodes))
{
memcpy(lpCodes, This->lpLcl->lpGbl->lpdwFourCC, sizeof(DWORD)* min(This->lpLcl->lpGbl->dwNumFourCC, *lpNumCodes));
}
else
{
*lpNumCodes = This->lpLcl->lpGbl->dwNumFourCC;
}
}
_SEH_END;
LeaveCriticalSection(&ddcs);
//LeaveCriticalSection(&ddcs);
return retVal;
}

1
reactos/dll/directx/ddraw/ddraw.rbuild
View file

@ -16,6 +16,7 @@
<library>user32</library>
<library>advapi32</library>
<library>msvcrt</library>
<library>pseh</library>
<file>ddraw.rc</file>
<file>main.c</file>