From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 23235 invoked from network); 2 Aug 2020 22:54:54 -0000 Received: from mother.openwall.net (195.42.179.200) by inbox.vuxu.org with ESMTPUTF8; 2 Aug 2020 22:54:54 -0000 Received: (qmail 15868 invoked by uid 550); 2 Aug 2020 22:54:48 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 15838 invoked from network); 2 Aug 2020 22:54:47 -0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dereferenced.org; s=default; t=1596408876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=4qVLCYXcZnycMLr9ld6KwoUny4+ah1xyMDmwZeM09JY=; b=Pm9337hc2wpV5pXZfD/CXtD0wPthelmmQAqBF/NxdlBPXkIp5WkoawTKUeRIXlD7seHHRt LsPOvD7cXwYZ8PLsm9i8bFsO+/7HCGqPRmPVT+Yyun3IhQ0VkNEVPb1oxfDdsex9p52aI2 0yVOqwMc7ym8fIgWeaX6R+zPImsQ/6I= From: Ariadne Conill To: musl@lists.openwall.com Cc: Ariadne Conill Date: Sun, 2 Aug 2020 16:54:26 -0600 Message-Id: <20200802225426.32002-1-ariadne@dereferenced.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [musl] [PATCH v4] implement recallocarray(3) This OpenBSD extension is similar to reallocarray(3), but zero-initializes the new memory area. This extension is placed in _BSD_SOURCE, like reallocarray(3). Changes from v3: - use calloc() instead of realloc() and always copy - explicitly zero old memory block - restore overflow checking for old size Changes from v2: - drop overflow checking for old size Changes from v1: - use realloc() instead of reallocarray() --- include/stdlib.h | 1 + src/malloc/recallocarray.c | 39 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 src/malloc/recallocarray.c diff --git a/include/stdlib.h b/include/stdlib.h index b54a051f..a0412ad4 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -146,6 +146,7 @@ int clearenv(void); #define WCOREDUMP(s) ((s) & 0x80) #define WIFCONTINUED(s) ((s) == 0xffff) void *reallocarray (void *, size_t, size_t); +void *recallocarray (void *, size_t, size_t, size_t); #endif #ifdef _GNU_SOURCE diff --git a/src/malloc/recallocarray.c b/src/malloc/recallocarray.c new file mode 100644 index 00000000..ce3adde4 --- /dev/null +++ b/src/malloc/recallocarray.c @@ -0,0 +1,39 @@ +#define _BSD_SOURCE +#include +#include +#include + +void *recallocarray(void *ptr, size_t om, size_t m, size_t n) +{ + void *newptr; + size_t old_size, new_size; + + if (n && m > -1 / n) { + errno = ENOMEM; + return 0; + } + new_size = m * n; + + if (n && om > -1 / n) { + errno = EINVAL; + return 0; + } + old_size = om * n; + + newptr = calloc(m, n); + if (!newptr) + return ptr; + + if (new_size <= old_size) { + memcpy((char *) newptr, ptr, new_size); + } + else { + memcpy((char *) newptr, ptr, old_size); + memset((char *) newptr + old_size, 0, new_size - old_size); + } + + memset(ptr, 0, old_size); + free(ptr); + + return newptr; +} -- 2.28.0