ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests 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 typedef struct
{ {
BOOL used; BOOL used;
DWORD data[dwBlockSize-sizeof(DWORD)]; BYTE data[dwBlockSize - sizeof(BOOL)];
} DPLAYX_MEM_SLICE; } DPLAYX_MEM_SLICE;
C_ASSERT(sizeof(DPLAYX_MEM_SLICE) == dwBlockSize);
static DPLAYX_MEM_SLICE* lpMemArea; static DPLAYX_MEM_SLICE* lpMemArea;
@ -100,7 +101,7 @@ static void DPLAYX_PrivHeapFree( LPVOID addr )
return; 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; dwBlockUsed = ((BYTE*)lpAddrStart - (BYTE*)lpMemArea)/dwBlockSize;
lpMemArea[ dwBlockUsed ].used = FALSE; lpMemArea[ dwBlockUsed ].used = FALSE;
@ -111,10 +112,10 @@ static LPVOID DPLAYX_PrivHeapAlloc( DWORD flags, DWORD size )
LPVOID lpvArea = NULL; LPVOID lpvArea = NULL;
UINT uBlockUsed; UINT uBlockUsed;
if( size > (dwBlockSize - sizeof(DWORD)) ) if( size > (dwBlockSize - sizeof(BOOL)) )
{ {
FIXME( "Size exceeded. Request of 0x%08x\n", size ); FIXME( "Size exceeded. Request of 0x%08x\n", size );
size = dwBlockSize - sizeof(DWORD); size = dwBlockSize - sizeof(BOOL);
} }
/* Find blank area */ /* Find blank area */