From be0301f45850ca70db0f2ec8258e73615a0ec7be Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Sun, 19 Aug 2012 10:50:39 +0200 Subject: calloc: check multiplication overflow --- sys/src/ape/lib/ap/gen/calloc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'sys/src/ape/lib/ap') diff --git a/sys/src/ape/lib/ap/gen/calloc.c b/sys/src/ape/lib/ap/gen/calloc.c index e52210d84..c080c7b3d 100644 --- a/sys/src/ape/lib/ap/gen/calloc.c +++ b/sys/src/ape/lib/ap/gen/calloc.c @@ -2,12 +2,14 @@ #include void * -calloc(size_t nmemb, size_t size) +calloc(size_t n, size_t s) { - void *mp; + void *v; - nmemb = nmemb*size; - if(mp = malloc(nmemb)) - memset(mp, 0, nmemb); - return(mp); + if(n > 1 && ((size_t)-1)/n < s) + return 0; + n *= s; + if(v = malloc(n)) + memset(v, 0, n); + return v; } -- cgit v1.2.3