mirrors
/
kore
mirror of https://git.kore.io/kore.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

fix kore_realloc() to actually behave properly

This commit is contained in:
Joris Vink 2013-06-27 09:20:48 +02:00
parent 4b2420097b
commit f18a6388fd
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mem.c
View File

@ -97,16 +97,19 @@ kore_realloc(void *ptr, size_t len)
struct meminfo *mem;
void *nptr;
mem = KORE_MEMINFO(ptr);
if (mem->magic != KORE_MEM_MAGIC)
fatal("kore_realloc(): magic boundary not found");
if (ptr == NULL) {
nptr = kore_malloc(len);
} else {
mem = KORE_MEMINFO(ptr);
if (mem->magic != KORE_MEM_MAGIC)
fatal("kore_realloc(): magic boundary not found");
nptr = kore_malloc(len);
memcpy(nptr, mem->addr, mem->clen);
kore_mem_free(mem);
nptr = kore_malloc(len);
memcpy(nptr, ptr, mem->clen);
kore_mem_free(ptr);
}
mem = (struct meminfo *)nptr - sizeof(*mem);
return (mem->addr);
return (nptr);
}
void *