system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 01:34:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

krnl386.exe: Fix a potential leak and NULL dereference in DPMI_xrealloc.

Browse source
This commit is contained in:
Andrew Nguyen 2010-07-18 16:23:21 -05:00 committed by Alexandre Julliard
parent ea7bcc6c3f
commit be5d66f5d8
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dlls/krnl386.exe16/int31.c
View file

@ -263,21 +263,21 @@ static void DPMI_xfree( LPVOID ptr )
*
* FIXME: perhaps we could grow this mapped area...
*/
static LPVOID DPMI_xrealloc( LPVOID ptr, DWORD newsize )
static LPVOID DPMI_xrealloc( LPVOID ptr, DWORD newsize )
{
MEMORY_BASIC_INFORMATION mbi;
LPVOID newptr;
newptr = DPMI_xalloc( newsize );
if (ptr)
if (ptr)
{
if (!VirtualQuery(ptr,&mbi,sizeof(mbi)))
LPVOID newptr;
if (!VirtualQuery(ptr,&mbi,sizeof(mbi)))
{
FIXME( "realloc of DPMI_xallocd region %p?\n", ptr );
return NULL;
}
if (mbi.State == MEM_FREE)
if (mbi.State == MEM_FREE)
{
FIXME( "realloc of DPMI_xallocd region %p?\n", ptr );
return NULL;
@ -289,11 +289,17 @@ static LPVOID DPMI_xrealloc( LPVOID ptr, DWORD newsize )
if (newsize <= mbi.RegionSize)
return ptr;
newptr = DPMI_xalloc( newsize );
if (!newptr)
return NULL;
memcpy( newptr, ptr, mbi.RegionSize );
DPMI_xfree( ptr );
return newptr;
}
return newptr;
return DPMI_xalloc( newsize );
}