cpmadevs/cnq3
0
0
Fork 0
mirror of https://bitbucket.org/CPMADevs/cnq3 synced 2025-02-01 13:20:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed a memory leak due to an incorrect munmap argument (credit: Cyrax)

Browse source
This commit is contained in:
myT 2017-03-08 16:10:34 +01:00
parent 0bc9c75e49
commit d945904298
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/qcommon/vm_local.h
View file

@ -182,6 +182,8 @@ struct vm_s {
vmFunc_t codeBase; vmFunc_t codeBase;
int codeLength; int codeLength;
int allocSize; // total allocation size, in bytes
int dataMask; int dataMask;
int dataLength; // exact data segment length int dataLength; // exact data segment length

18
code/qcommon/vm_x86.cpp
View file

@ -2319,7 +2319,7 @@ __compile:
VM_FreeBuffers(); VM_FreeBuffers();
#ifdef VM_X86_MMAP #ifdef VM_X86_MMAP
if ( mprotect( vm->codeBase.ptr, compiledOfs + n, PROT_READ|PROT_EXEC ) ) { if ( mprotect( vm->codeBase.ptr, vm->allocSize, PROT_READ|PROT_EXEC ) ) {
VM_Destroy_Compiled( vm ); VM_Destroy_Compiled( vm );
Com_Error( ERR_FATAL, "VM_CompileX86: mprotect failed" ); Com_Error( ERR_FATAL, "VM_CompileX86: mprotect failed" );
return qfalse; return qfalse;
@ -2329,7 +2329,7 @@ __compile:
DWORD oldProtect = 0; DWORD oldProtect = 0;
// remove write permissions. // remove write permissions.
if ( !VirtualProtect( vm->codeBase.ptr, compiledOfs + n, PAGE_EXECUTE_READ, &oldProtect ) ) { if ( !VirtualProtect( vm->codeBase.ptr, vm->allocSize, PAGE_EXECUTE_READ, &oldProtect ) ) {
VM_Destroy_Compiled( vm ); VM_Destroy_Compiled( vm );
Com_Error( ERR_FATAL, "VM_CompileX86: VirtualProtect failed" ); Com_Error( ERR_FATAL, "VM_CompileX86: VirtualProtect failed" );
return qfalse; return qfalse;
@ -2352,25 +2352,22 @@ VM_Alloc_Compiled
*/ */
static void *VM_Alloc_Compiled(vm_t *vm, int codeLength, int tableLength) static void *VM_Alloc_Compiled(vm_t *vm, int codeLength, int tableLength)
{ {
void *ptr; const int length = codeLength + tableLength;
int length;
length = codeLength + tableLength;
#ifdef VM_X86_MMAP #ifdef VM_X86_MMAP
ptr = mmap( NULL, length, PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0 ); void* const ptr = mmap( NULL, length, PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0 );
if ( ptr == MAP_FAILED ) { if ( ptr == MAP_FAILED ) {
Com_Error( ERR_FATAL, "VM_CompileX86: mmap failed" ); Com_Error( ERR_FATAL, "VM_CompileX86: mmap failed" );
return NULL; return NULL;
} }
#elif _WIN32 #elif _WIN32
// allocate memory with EXECUTE permissions under windows. // allocate memory with EXECUTE permissions under windows.
ptr = VirtualAlloc( NULL, length, MEM_COMMIT, PAGE_EXECUTE_READWRITE ); void* const ptr = VirtualAlloc(NULL, length, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
if ( !ptr ) { if ( !ptr ) {
Com_Error( ERR_FATAL, "VM_CompileX86: VirtualAlloc failed" ); Com_Error( ERR_FATAL, "VM_CompileX86: VirtualAlloc failed" );
return NULL; return NULL;
} }
#else #else
ptr = malloc( length ); void* const ptr = malloc( length );
if ( !ptr ) { if ( !ptr ) {
Com_Error( ERR_FATAL, "VM_CompileX86: malloc failed" ); Com_Error( ERR_FATAL, "VM_CompileX86: malloc failed" );
return NULL; return NULL;
@ -2378,6 +2375,7 @@ static void *VM_Alloc_Compiled(vm_t *vm, int codeLength, int tableLength)
#endif #endif
vm->codeBase.ptr = (byte*)ptr; vm->codeBase.ptr = (byte*)ptr;
vm->codeLength = codeLength; vm->codeLength = codeLength;
vm->allocSize = length;
return vm->codeBase.ptr; return vm->codeBase.ptr;
} }
@ -2390,7 +2388,7 @@ VM_Destroy_Compiled
static void VM_Destroy_Compiled(vm_t* vm) static void VM_Destroy_Compiled(vm_t* vm)
{ {
#ifdef VM_X86_MMAP #ifdef VM_X86_MMAP
munmap( vm->codeBase.ptr, vm->codeLength ); munmap( vm->codeBase.ptr, vm->allocSize );
#elif _WIN32 #elif _WIN32
VirtualFree( vm->codeBase.ptr, 0, MEM_RELEASE ); VirtualFree( vm->codeBase.ptr, 0, MEM_RELEASE );
#else #else