ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added flag to differentiate file mappings and VirtualAlloc() blocks, 

and reject VirtualFree() calls on file mappings.
This commit is contained in:
Alexandre Julliard 2001-01-12 19:59:42 +00:00
parent a5ed3b19eb
commit efc32d1353
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
memory/virtual.c
View File

@ -56,6 +56,7 @@ typedef struct _FV
/* Per-view flags */ /* Per-view flags */
#define VFLAG_SYSTEM 0x01 #define VFLAG_SYSTEM 0x01
#define VFLAG_VALLOC 0x02 /* allocated by VirtualAlloc */
/* Conversion from VPROT_* to Win32 flags */ /* Conversion from VPROT_* to Win32 flags */
static const BYTE VIRTUAL_Win32Flags[16] = static const BYTE VIRTUAL_Win32Flags[16] =
@ -139,10 +140,13 @@ static void VIRTUAL_DumpView( FILE_VIEW *view )
UINT addr = view->base; UINT addr = view->base;
BYTE prot = view->prot[0]; BYTE prot = view->prot[0];
DPRINTF( "View: %08x - %08x%s", DPRINTF( "View: %08x - %08x",
view->base, view->base + view->size - 1, view->base, view->base + view->size - 1 );
(view->flags & VFLAG_SYSTEM) ? " (system)" : "" ); if (view->flags & VFLAG_SYSTEM)
if (view->mapping) DPRINTF( " (system)\n" );
else if (view->flags & VFLAG_VALLOC)
DPRINTF( " (valloc)\n" );
else if (view->mapping)
DPRINTF( " %d\n", view->mapping ); DPRINTF( " %d\n", view->mapping );
else else
DPRINTF( " (anonymous)\n"); DPRINTF( " (anonymous)\n");
@ -791,8 +795,9 @@ LPVOID WINAPI VirtualAlloc(
SetLastError( ERROR_INVALID_ADDRESS ); SetLastError( ERROR_INVALID_ADDRESS );
return NULL; return NULL;
} }
if (!(view = VIRTUAL_CreateView( ptr, size, (type & MEM_SYSTEM) ? if (!(view = VIRTUAL_CreateView( ptr, size,
VFLAG_SYSTEM : 0, vprot, 0 ))) VFLAG_VALLOC | ((type & MEM_SYSTEM) ? VFLAG_SYSTEM : 0),
vprot, 0 )))
{ {
munmap( (void *)ptr, size ); munmap( (void *)ptr, size );
SetLastError( ERROR_OUTOFMEMORY ); SetLastError( ERROR_OUTOFMEMORY );
@ -859,7 +864,8 @@ BOOL WINAPI VirtualFree(
base = ROUND_ADDR( addr ); base = ROUND_ADDR( addr );
if (!(view = VIRTUAL_FindView( base )) || if (!(view = VIRTUAL_FindView( base )) ||
(base + size > view->base + view->size)) (base + size > view->base + view->size) ||
!(view->flags & VFLAG_VALLOC))
{ {
SetLastError( ERROR_INVALID_PARAMETER ); SetLastError( ERROR_INVALID_PARAMETER );
return FALSE; return FALSE;