mchunkptr p;
INTERNAL_SIZE_T csz;
- INTERNAL_SIZE_T sz = n * elem_size;
+ INTERNAL_SIZE_T sz;
#if MORECORE_CLEARS
mchunkptr oldtop;
#endif
Void_t* mem;
+ if (__builtin_mul_overflow((INTERNAL_SIZE_T) n, (INTERNAL_SIZE_T) elem_size, &sz))
+ {
+ errno = ENOMEM;
+ return 0;
+ }
+
/* check if expand_top called, in which case don't need to clear */
#if MORECORE_CLEARS
MALLOC_LOCK;
* Implement calloc simply by calling malloc and set zero */
void * nano_calloc(RARG malloc_size_t n, malloc_size_t elem)
{
- void * mem = nano_malloc(RCALL n * elem);
- if (mem != NULL) memset(mem, 0, n * elem);
+ ptrdiff_t bytes;
+ void * mem;
+
+ if (__builtin_mul_overflow (n, elem, &bytes))
+ {
+ RERRNO = ENOMEM;
+ return NULL;
+ }
+ mem = nano_malloc(bytes);
+ if (mem != NULL) memset(mem, 0, bytes);
return mem;
}
#endif /* DEFINE_CALLOC */
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/lib/libc/stdlib/reallocarray.c 282314 2015-05-01 18:32:16Z bapt $");
-
#include <sys/types.h>
#include <errno.h>
#include <stdint.h>
#include <stdlib.h>
-/*
- * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
- * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
- */
-#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4))
-
void *
reallocarray(void *optr, size_t nmemb, size_t size)
{
+ ptrdiff_t bytes;
- if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
- nmemb > 0 && SIZE_MAX / nmemb < size) {
+ if (__builtin_mul_overflow (nmemb, size, &bytes))
+ {
errno = ENOMEM;
- return (NULL);
+ return NULL;
}
- return (realloc(optr, size * nmemb));
+ return realloc(optr, bytes);
}