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

Add integer overflow checks to kore_calloc

This commit is contained in:
Joris Vink 2014-04-23 14:26:28 +02:00
parent fd7f547013
commit f3fe543358
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mem.c
View File

@ -44,6 +44,9 @@ kore_malloc(size_t len)
u_int8_t *addr; u_int8_t *addr;
u_int32_t *plen; u_int32_t *plen;
if (len == 0)
fatal("kore_malloc(): zero size");
mlen = sizeof(u_int32_t) + len + sizeof(struct meminfo); mlen = sizeof(u_int32_t) + len + sizeof(struct meminfo);
if ((ptr = malloc(mlen)) == NULL) if ((ptr = malloc(mlen)) == NULL)
fatal("kore_malloc(%d): %d", len, errno); fatal("kore_malloc(%d): %d", len, errno);
@ -68,6 +71,9 @@ kore_realloc(void *ptr, size_t len)
struct meminfo *mem; struct meminfo *mem;
void *nptr; void *nptr;
if (len == 0)
fatal("kore_realloc(): zero size");
if (ptr == NULL) { if (ptr == NULL) {
nptr = kore_malloc(len); nptr = kore_malloc(len);
} else { } else {
@ -86,6 +92,11 @@ kore_realloc(void *ptr, size_t len)
void * void *
kore_calloc(size_t memb, size_t len) kore_calloc(size_t memb, size_t len)
{ {
if (memb == 0 || len == 0)
fatal("kore_calloc(): zero size");
if (SIZE_MAX / memb < len)
fatal("kore_calloc: memb * len > SIZE_MAX");
return (kore_malloc(memb * len)); return (kore_malloc(memb * len));
} }