darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-02-21 02:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing util_memory_r

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-11-15 21:36:36 +01:00
parent 3bd75546ec
commit 4517072af4
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
util.c
View file

@ -92,7 +92,7 @@ void *util_memory_r(void *ptrn, size_t byte, unsigned int line, const char *file
}
oldinfo = ((struct memblock_t*)ptrn - 1);
newinfo = malloc(sizeof(struct memblock_t) + byte);
newinfo = ((struct memblock_t*)malloc(sizeof(struct memblock_t) + byte));
util_debug("MEM", "reallocation: % 8u -> %u (bytes) address 0x%08X -> 0x%08X @ %s:%u\n", oldinfo->byte, byte, ptrn, (void*)(newinfo+1), file, line);
@ -101,27 +101,33 @@ void *util_memory_r(void *ptrn, size_t byte, unsigned int line, const char *file
util_memory_d(oldinfo+1, line, file);
return NULL;
}
newinfo->line = line;
newinfo->byte = byte;
newinfo->file = file;
newinfo->next = oldinfo->next;
newinfo->prev = oldinfo->prev;
if (newinfo->next)
newinfo->next->prev = newinfo;
if (newinfo->prev)
newinfo->prev->next = newinfo;
if (mem_start == oldinfo)
mem_start = newinfo;
/* copy old */
memcpy(newinfo+1, oldinfo+1, oldinfo->byte);
/* drop old */
mem_db += newinfo->byte;
mem_db -= oldinfo->byte;
/* free old */
if (oldinfo->prev)
oldinfo->prev->next = oldinfo->next;
if (oldinfo->next)
oldinfo->next->prev = oldinfo->prev;
if (oldinfo == mem_start)
mem_start = oldinfo->next;
/* fill info */
newinfo->line = line;
newinfo->byte = byte;
newinfo->file = file;
newinfo->prev = NULL;
newinfo->next = mem_start;
if (mem_start)
mem_start->prev = newinfo;
mem_start = newinfo;
mem_ab -= oldinfo->byte;
mem_ab += newinfo->byte;
free(oldinfo);
/* update */
return newinfo+1;
}