X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.c;fp=string.c;h=f01c83929850d7873516f38dbed6864c458406de;hp=f98b199b569856d7e6df624eaf6cb1cd7ff5802e;hb=27c08870ba172782f6406045007b6ff32a4f7329;hpb=f484411f1a48386975f55d1273750ca3c926aa9a

diff --git a/string.c b/string.c
index f98b199b..f01c8392 100644
--- a/string.c
+++ b/string.c
@@ -43,6 +43,25 @@ __must_check void *arr_realloc(void *ptr, size_t nmemb, size_t size)
 	return ptr;
 }
 
+/**
+ * Allocate an array, abort on failure or bugs.
+ *
+ * \param nmemb See \ref arr_realloc().
+ * \param size See \ref arr_realloc().
+ *
+ * Like \ref arr_realloc(), this aborts on invalid arguments, integer overflow
+ * and allocation errors.
+ *
+ * \return A pointer to newly allocated memory which is suitably aligned for
+ * any kind of variable.
+ *
+ * \sa See \ref arr_realloc().
+ */
+__must_check __malloc void *arr_alloc(size_t nmemb, size_t size)
+{
+	return arr_realloc(NULL, nmemb, size);
+}
+
 /**
  * Paraslash's version of realloc().
  *
@@ -76,16 +95,7 @@ __must_check void *para_realloc(void *p, size_t size)
  */
 __must_check __malloc void *alloc(size_t size)
 {
-	void *p;
-
-	assert(size);
-	p = malloc(size);
-	if (!p) {
-		PARA_EMERG_LOG("malloc failed (size = %zu), aborting\n",
-			size);
-		exit(EXIT_FAILURE);
-	}
-	return p;
+	return arr_alloc(1, size);
 }
 
 /**
@@ -741,7 +751,7 @@ void free_argv(char **argv)
 static int create_argv_offset(int offset, const char *buf, const char *delim,
 		char ***result)
 {
-	char *word, **argv = alloc((offset + 1) * sizeof(char *));
+	char *word, **argv = arr_alloc(offset + 1, sizeof(char *));
 	const char *p;
 	int i, ret;
 
@@ -1029,7 +1039,7 @@ __must_check int strwidth(const char *s, size_t *result)
 		return -ERRNO_TO_PARA_ERROR(errno);
 	if (num_wchars == 0)
 		return 0;
-	dest = alloc((num_wchars + 1) * sizeof(*dest));
+	dest = arr_alloc(num_wchars + 1, sizeof(*dest));
 	src = s;
 	memset(&state, 0, sizeof(state));
 	num_wchars = mbsrtowcs(dest, &src, num_wchars, &state);
@@ -1084,7 +1094,7 @@ __must_check int sanitize_str(const char *src, size_t max_width,
 	num_wchars = mbsrtowcs(NULL, &src, 0, &state);
 	if (num_wchars == (size_t)-1)
 		return -ERRNO_TO_PARA_ERROR(errno);
-	wcs = alloc((num_wchars + 1) * sizeof(*wcs));
+	wcs = arr_alloc(num_wchars + 1, sizeof(*wcs));
 	memset(&state, 0, sizeof(state));
 	num_wchars = mbsrtowcs(wcs, &src, num_wchars + 1, &state);
 	assert(num_wchars != (size_t)-1);