system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 09:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

dplayx: Fix broken pointer arithmetic.

Browse source
This commit is contained in:
Thomas Faber 2014-03-25 11:11:25 +01:00 committed by Alexandre Julliard
parent d60910fc14
commit 4b1fb32d9d
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/dplayx/dplayx_global.c
View file

@ -84,8 +84,9 @@ static LPVOID lpSharedStaticData = NULL;
typedef struct
{
BOOL used;
DWORD data[dwBlockSize-sizeof(DWORD)];
BYTE data[dwBlockSize - sizeof(BOOL)];
} DPLAYX_MEM_SLICE;
C_ASSERT(sizeof(DPLAYX_MEM_SLICE) == dwBlockSize);
static DPLAYX_MEM_SLICE* lpMemArea;
@ -100,7 +101,7 @@ static void DPLAYX_PrivHeapFree( LPVOID addr )
return;
}
lpAddrStart = (char*)addr - sizeof(DWORD); /* Find block header */
lpAddrStart = CONTAINING_RECORD(addr, DPLAYX_MEM_SLICE, data); /* Find block header */
dwBlockUsed = ((BYTE*)lpAddrStart - (BYTE*)lpMemArea)/dwBlockSize;
lpMemArea[ dwBlockUsed ].used = FALSE;
@ -111,10 +112,10 @@ static LPVOID DPLAYX_PrivHeapAlloc( DWORD flags, DWORD size )
LPVOID lpvArea = NULL;
UINT uBlockUsed;
if( size > (dwBlockSize - sizeof(DWORD)) )
if( size > (dwBlockSize - sizeof(BOOL)) )
{
FIXME( "Size exceeded. Request of 0x%08x\n", size );
size = dwBlockSize - sizeof(DWORD);
size = dwBlockSize - sizeof(BOOL);
}
/* Find blank area */