From ac45e8cd62f925c9777cc67d15e32019e1ebc44b Mon Sep 17 00:00:00 2001 From: Stig Telfer Date: Tue, 29 Dec 2015 21:29:35 +0000 Subject: [PATCH] Revert incorrect parameter validation --- src/mem.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/mem.c b/src/mem.c index 5b9e5e5..de26dac 100644 --- a/src/mem.c +++ b/src/mem.c @@ -89,19 +89,12 @@ kore_realloc(void *ptr, size_t len) void * kore_calloc(size_t memb, size_t len) { - void *result; - const size_t nbytes = memb * len; - - if (nbytes == 0) + if (memb == 0 || len == 0) fatal("kore_calloc(): zero size"); - if (nbytes > SIZE_MAX) + if (SIZE_MAX / memb < len) fatal("kore_calloc: memb * len > SIZE_MAX"); - - result = kore_malloc(nbytes); - if (result == NULL) - fatal("kore_calloc: alloc failed for %zd bytes", nbytes); - return (result); + return (kore_malloc(memb * len)); } void