sad

commit d5612adbde3a391153f2c85ea71ccf9e2660d819
parent 0cccd5c89bb700568544ec18e9789da647378cea
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Fri, 26 Dec 2014 18:44:33 +0100

compat: add reallocarray for linux

Diffstat:
M
Makefile
 | 
4
++++
A
compat.h
 | 
2
++
A
compat/reallocarray.c
 | 
38
++++++++++++++++++++++++++++++++++++++
M
sad.h
 | 
4
++++

4 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
@@ -10,6 +10,10 @@ LDLIBS = -lsndfile -lmpg123 -lsndio -logg -lvorbis -lvorbisfile
 OBJ = sndio.o cmd.o mp3.o wav.o vorbis.o playlist.o sad.o tokenizer.o decoder.o
 BIN = sad
 
+# non-OpenBSD
+OBJ += compat/reallocarray.o
+CFLAGS += -DCOMPAT
+
 all: $(BIN)
 
 $(BIN): $(OBJ)
diff --git a/compat.h b/compat.h
@@ -0,0 +1,2 @@
+#undef reallocarray
+void * reallocarray(void *, size_t, size_t);
diff --git a/compat/reallocarray.c b/compat/reallocarray.c
@@ -0,0 +1,38 @@
+/*	$OpenBSD: reallocarray.c,v 1.1 2014/05/08 21:43:49 deraadt Exp $	*/
+/*
+ * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#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	(1UL << (sizeof(size_t) * 4))
+
+void *
+reallocarray(void *optr, size_t nmemb, size_t size)
+{
+	if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
+	    nmemb > 0 && SIZE_MAX / nmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	return realloc(optr, size * nmemb);
+}
diff --git a/sad.h b/sad.h
@@ -1,3 +1,7 @@
+#ifdef COMPAT
+#include "compat.h"
+#endif
+
 #define LEN(x) (sizeof (x) / sizeof *(x))
 #define PROTOCOLVERSION "0.0"