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, 5 insertions, 5 deletions

diff --git a/src/dbUtils.c b/src/dbUtils.c
index 212ea83d2..c8b637b88 100644
--- a/src/dbUtils.c
+++ b/src/dbUtils.c
@@ -69,14 +69,14 @@ static int initLocateTagItem(LocateTagItem * item, char *typeStr, char *needle)
 	if (item->tagType < 0)
 		return -1;
 
-	item->needle = strdup(needle);
+	item->needle = xstrdup(needle);
 
 	return 0;
 }
 
 LocateTagItem *newLocateTagItem(char *typeStr, char *needle)
 {
-	LocateTagItem *ret = malloc(sizeof(LocateTagItem));
+	LocateTagItem *ret = xmalloc(sizeof(LocateTagItem));
 
 	if (initLocateTagItem(ret, typeStr, needle) < 0) {
 		free(ret);
@@ -108,7 +108,7 @@ int newLocateTagItemArrayFromArgArray(char *argArray[],
 	if (numArgs % 2 != 0)
 		return -1;
 
-	*arrayRet = malloc(sizeof(LocateTagItem) * numArgs / 2);
+	*arrayRet = xmalloc(sizeof(LocateTagItem) * numArgs / 2);
 
 	for (i = 0, item = *arrayRet; i < numArgs / 2; i++, item++) {
 		if (initLocateTagItem
@@ -214,7 +214,7 @@ int searchForSongsIn(int fd, char *name, int numItems, LocateTagItem * items)
 	int ret = -1;
 	int i;
 
-	char **originalNeedles = malloc(numItems * sizeof(char *));
+	char **originalNeedles = xmalloc(numItems * sizeof(char *));
 	LocateTagItemArray array;
 
 	for (i = 0; i < numItems; i++) {
@@ -347,7 +347,7 @@ unsigned long sumSongTimesIn(int fd, char *name)
 static ListCommandItem *newListCommandItem(int tagType, int numConditionals,
 					   LocateTagItem * conditionals)
 {
-	ListCommandItem *item = malloc(sizeof(ListCommandItem));
+	ListCommandItem *item = xmalloc(sizeof(ListCommandItem));
 
 	item->tagType = tagType;
 	item->numConditionals = numConditionals;