Replace strdup and {c,re,m}alloc with x* variants to check for OOM errors

I'm checking for zero-size allocations and assert()-ing them,
so we can more easily get backtraces and debug problems, but we'll
also allow -DNDEBUG people to live on the edge if they wish.

We do not rely on errno when checking for OOM errors because
some implementations of malloc do not set it, and malloc
is commonly overridden by userspace wrappers.

I've spent some time looking through the source and didn't find any
obvious places where we would explicitly allocate 0 bytes, so we
shouldn't trip any of those assertions.

We also avoid allocating zero bytes because C libraries don't
handle this consistently (some return NULL, some not); and it's
dangerous either way.

git-svn-id: https://svn.musicpd.org/mpd/trunk@4690 09075e82-0dd4-0310-85a5-a0d7c8717e4f

1 files changed, 7 insertions, 7 deletions

diff --git a/src/conf.c b/src/conf.c
index c12a6f292..b5bbd8e92 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -52,12 +52,12 @@ static List *configEntriesList = NULL;
 
 static ConfigParam *newConfigParam(char *value, int line)
 {
-	ConfigParam *ret = malloc(sizeof(ConfigParam));
+	ConfigParam *ret = xmalloc(sizeof(ConfigParam));
 
 	if (!value)
 		ret->value = NULL;
 	else
-		ret->value = strdup(value);
+		ret->value = xstrdup(value);
 
 	ret->line = line;
 
@@ -91,7 +91,7 @@ static void freeConfigParam(ConfigParam * param)
 
 static ConfigEntry *newConfigEntry(int repeatable, int block)
 {
-	ConfigEntry *ret = malloc(sizeof(ConfigEntry));
+	ConfigEntry *ret = xmalloc(sizeof(ConfigEntry));
 
 	ret->mask = 0;
 	ret->configParamList =
@@ -180,13 +180,13 @@ static void addBlockParam(ConfigParam * param, char *name, char *value,
 {
 	param->numberOfBlockParams++;
 
-	param->blockParams = realloc(param->blockParams,
+	param->blockParams = xrealloc(param->blockParams,
 				     param->numberOfBlockParams *
 				     sizeof(BlockParam));
 
-	param->blockParams[param->numberOfBlockParams - 1].name = strdup(name);
+	param->blockParams[param->numberOfBlockParams - 1].name = xstrdup(name);
 	param->blockParams[param->numberOfBlockParams - 1].value =
-	    strdup(value);
+	    xstrdup(value);
 	param->blockParams[param->numberOfBlockParams - 1].line = line;
 }
 
@@ -452,7 +452,7 @@ ConfigParam *parseConfigFilePath(char *name, int force)
 			if (foundSlash)
 				*ch = '/';
 		}
-		newPath = malloc(strlen(pwd->pw_dir) + strlen(path + pos) + 1);
+		newPath = xmalloc(strlen(pwd->pw_dir) + strlen(path + pos) + 1);
 		strcpy(newPath, pwd->pw_dir);
 		strcat(newPath, path + pos);
 		free(param->value);