From ad1a0463067bba232ec8e19f458e1fc7d7c80b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 12 Mar 2024 02:49:05 +0100 Subject: add reallocarray from musl --- include/stdlib.h | 2 ++ libc/stdlib/malloc-standard/reallocarray.c | 36 ++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 libc/stdlib/malloc-standard/reallocarray.c diff --git a/include/stdlib.h b/include/stdlib.h index 987fe2223..8b1375184 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -985,6 +985,8 @@ extern int getpt (void); three, but may be less than NELEM), or -1 if an error occurred. */ extern int getloadavg (double __loadavg[], int __nelem) __THROW __nonnull ((1)); + +extern void *reallocarray (void *__ptr, size_t __m, size_t __n); #endif #ifdef _LIBC diff --git a/libc/stdlib/malloc-standard/reallocarray.c b/libc/stdlib/malloc-standard/reallocarray.c new file mode 100644 index 000000000..e4044c3f5 --- /dev/null +++ b/libc/stdlib/malloc-standard/reallocarray.c @@ -0,0 +1,36 @@ +/* +Copyright © 2005-2020 Rich Felker, et al. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +#define _BSD_SOURCE +#include +#include + +void *reallocarray(void *ptr, size_t m, size_t n) +{ + if (n && m > -1 / n) { + errno = ENOMEM; + return 0; + } + + return realloc(ptr, m * n); +} -- cgit v1.2.3