#define _XMALLOCA_H
#include "malloca.h"
+#include "xalloc.h"
#ifdef __cplusplus
/* xmalloca(N) is a checking safe variant of alloca(N). It allocates N bytes
- of memory allocated on the stack, that must be freed using freesa() before
+ of memory allocated on the stack, that must be freed using freea() before
the function returns. Upon failure, it exits with an error message. */
#if HAVE_ALLOCA
# define xmalloca(N) \
xmalloc (N)
#endif
-/* Maybe we should also define a variant
- xnmalloca (size_t n, size_t s) - behaves like xmalloca (n * s)
- If this would be useful in your application. please speak up. */
+/* xnmalloca(N,S) is an overflow-safe variant of xmalloca (N * S).
+ It allocates an array of N objects, each with S bytes of memory,
+ on the stack. S must be positive and N must be nonnegative.
+ The array must be freed using freea() before the function returns.
+ Upon failure, it exits with an error message. */
+#if HAVE_ALLOCA
+/* Rely on xmalloca (SIZE_MAX) calling xalloc_die (). */
+# define xnmalloca(n, s) \
+ xmalloca (xalloc_oversized ((n), (s)) ? (size_t) (-1) : (n) * (s))
+#else
+# define xnmalloca(n, s) \
+ xnmalloc ((n), (s))
+#endif
#ifdef __cplusplus