mailing list of musl libc
 help / color / mirror / code / Atom feed
From: Ariadne Conill <ariadne@dereferenced.org>
To: musl@lists.openwall.com
Cc: Ariadne Conill <ariadne@dereferenced.org>
Subject: [musl] [PATCH] implement reallocarray(3)
Date: Tue, 21 Jul 2020 18:24:26 -0600	[thread overview]
Message-ID: <20200722002426.23580-1-ariadne@dereferenced.org> (raw)

reallocarray(3) is an extension introduced by OpenBSD, which
introduces calloc(3) overflow checking to realloc(3).

glibc 2.28 introduced support for this function behind _GNU_SOURCE,
while glibc 2.29 allows its usage in _DEFAULT_SOURCE, so I made it
available by default as well.
---
 include/stdlib.h          |  1 +
 src/malloc/reallocarray.c | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 src/malloc/reallocarray.c

diff --git a/include/stdlib.h b/include/stdlib.h
index 194c2033..8db8e5cc 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -38,6 +38,7 @@ void srand (unsigned);
 void *malloc (size_t);
 void *calloc (size_t, size_t);
 void *realloc (void *, size_t);
+void *reallocarray (void *, size_t, size_t);
 void free (void *);
 void *aligned_alloc(size_t, size_t);
 
diff --git a/src/malloc/reallocarray.c b/src/malloc/reallocarray.c
new file mode 100644
index 00000000..733cb16a
--- /dev/null
+++ b/src/malloc/reallocarray.c
@@ -0,0 +1,13 @@
+#include <errno.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+void *reallocarray(void *ptr, size_t m, size_t n)
+{
+	if (n && m > (size_t) -1 / n) {
+		errno = ENOMEM;
+		return NULL;
+	}
+
+	return realloc(ptr, m * n);
+}
-- 
2.27.0


             reply	other threads:[~2020-07-22  0:24 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-22  0:24 Ariadne Conill [this message]
2020-07-22  0:33 ` Rich Felker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200722002426.23580-1-ariadne@dereferenced.org \
    --to=ariadne@dereferenced.org \
    --cc=musl@lists.openwall.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).