7 files changed, 18 insertions, 18 deletions
diff --git a/src/audioOutputs/audioOutput_alsa.c b/src/audioOutputs/audioOutput_alsa.c
index 31601b37c..85872c09a 100644
--- a/src/audioOutputs/audioOutput_alsa.c
+++ b/src/audioOutputs/audioOutput_alsa.c
@@ -59,7 +59,7 @@ typedef struct _AlsaData {
 
 static AlsaData *newAlsaData(void)
 {
-	AlsaData *ret = malloc(sizeof(AlsaData));
+	AlsaData *ret = xmalloc(sizeof(AlsaData));
 
 	ret->device = NULL;
 	ret->pcmHandle = NULL;
@@ -85,7 +85,7 @@ static int alsa_initDriver(AudioOutput * audioOutput, ConfigParam * param)
 
 	if (param) {
 		BlockParam *bp = getBlockParam(param, "device");
-		ad->device = bp ? strdup(bp->value) : strdup("default");
+		ad->device = bp ? xstrdup(bp->value) : xstrdup("default");
 
 		if ((bp = getBlockParam(param, "use_mmap")) &&
 		    (!strcasecmp(bp->value, "yes") ||
@@ -96,7 +96,7 @@ static int alsa_initDriver(AudioOutput * audioOutput, ConfigParam * param)
 		if ((bp = getBlockParam(param, "period_time")))
 			ad->period_time = atoi(bp->value);
 	} else
-		ad->device = strdup("default");
+		ad->device = xstrdup("default");
 	audioOutput->data = ad;
 
 	return 0;
diff --git a/src/audioOutputs/audioOutput_ao.c b/src/audioOutputs/audioOutput_ao.c
index e94a6e6b7..bf4b99a34 100644
--- a/src/audioOutputs/audioOutput_ao.c
+++ b/src/audioOutputs/audioOutput_ao.c
@@ -40,7 +40,7 @@ typedef struct _AoData {
 
 static AoData *newAoData(void)
 {
-	AoData *ret = malloc(sizeof(AoData));
+	AoData *ret = xmalloc(sizeof(AoData));
 	ret->device = NULL;
 	ret->options = NULL;
 
@@ -112,9 +112,9 @@ static int audioOutputAo_initDriver(AudioOutput * audioOutput,
 	blockParam = getBlockParam(param, "options");
 
 	if (blockParam) {
-		dup = strdup(blockParam->value);
+		dup = xstrdup(blockParam->value);
 	} else
-		dup = strdup("");
+		dup = xstrdup("");
 
 	if (strlen(dup)) {
 		stk1 = NULL;
diff --git a/src/audioOutputs/audioOutput_mvp.c b/src/audioOutputs/audioOutput_mvp.c
index b82b0a5b7..65116681a 100644
--- a/src/audioOutputs/audioOutput_mvp.c
+++ b/src/audioOutputs/audioOutput_mvp.c
@@ -109,7 +109,7 @@ static int mvp_testDefault(void)
 
 static int mvp_initDriver(AudioOutput * audioOutput, ConfigParam * param)
 {
-	MvpData *md = malloc(sizeof(MvpData));
+	MvpData *md = xmalloc(sizeof(MvpData));
 	md->fd = -1;
 	audioOutput->data = md;
 
diff --git a/src/audioOutputs/audioOutput_oss.c b/src/audioOutputs/audioOutput_oss.c
index bd66bb050..ddb1b1788 100644
--- a/src/audioOutputs/audioOutput_oss.c
+++ b/src/audioOutputs/audioOutput_oss.c
@@ -164,7 +164,7 @@ static void addSupportedParam(OssData * od, int param, int val)
 	int index = getIndexForParam(param);
 
 	od->numSupported[index]++;
-	od->supported[index] = realloc(od->supported[index],
+	od->supported[index] = xrealloc(od->supported[index],
 				       od->numSupported[index] * sizeof(int));
 	od->supported[index][od->numSupported[index] - 1] = val;
 }
@@ -174,7 +174,7 @@ static void addUnsupportedParam(OssData * od, int param, int val)
 	int index = getIndexForParam(param);
 
 	od->numUnsupported[index]++;
-	od->unsupported[index] = realloc(od->unsupported[index],
+	od->unsupported[index] = xrealloc(od->unsupported[index],
 					 od->numUnsupported[index] *
 					 sizeof(int));
 	od->unsupported[index][od->numUnsupported[index] - 1] = val;
@@ -193,7 +193,7 @@ static void removeSupportedParam(OssData * od, int param, int val)
 	}
 
 	od->numSupported[index]--;
-	od->supported[index] = realloc(od->supported[index],
+	od->supported[index] = xrealloc(od->supported[index],
 				       od->numSupported[index] * sizeof(int));
 }
 
@@ -210,7 +210,7 @@ static void removeUnsupportedParam(OssData * od, int param, int val)
 	}
 
 	od->numUnsupported[index]--;
-	od->unsupported[index] = realloc(od->unsupported[index],
+	od->unsupported[index] = xrealloc(od->unsupported[index],
 					 od->numUnsupported[index] *
 					 sizeof(int));
 }
@@ -254,7 +254,7 @@ static void unsupportParam(OssData * od, int param, int val)
 
 static OssData *newOssData(void)
 {
-	OssData *ret = malloc(sizeof(OssData));
+	OssData *ret = xmalloc(sizeof(OssData));
 
 	ret->device = NULL;
 	ret->fd = -1;
diff --git a/src/audioOutputs/audioOutput_osx.c b/src/audioOutputs/audioOutput_osx.c
index d386bcbfc..439aefab3 100644
--- a/src/audioOutputs/audioOutput_osx.c
+++ b/src/audioOutputs/audioOutput_osx.c
@@ -40,7 +40,7 @@ typedef struct _OsxData {
 
 static OsxData *newOsxData()
 {
-	OsxData *ret = malloc(sizeof(OsxData));
+	OsxData *ret = xmalloc(sizeof(OsxData));
 
 	pthread_mutex_init(&ret->mutex, NULL);
 	pthread_cond_init(&ret->condition, NULL);
@@ -284,7 +284,7 @@ static int osx_openDevice(AudioOutput * audioOutput)
 	/* create a buffer of 1s */
 	od->bufferSize = (audioFormat->sampleRate) *
 	    (audioFormat->bits >> 3) * (audioFormat->channels);
-	od->buffer = realloc(od->buffer, od->bufferSize);
+	od->buffer = xrealloc(od->buffer, od->bufferSize);
 
 	od->pos = 0;
 	od->len = 0;
diff --git a/src/audioOutputs/audioOutput_pulse.c b/src/audioOutputs/audioOutput_pulse.c
index d7c544cfe..3dade76b6 100644
--- a/src/audioOutputs/audioOutput_pulse.c
+++ b/src/audioOutputs/audioOutput_pulse.c
@@ -46,7 +46,7 @@ static PulseData *newPulseData(void)
 {
 	PulseData *ret;
 
-	ret = malloc(sizeof(PulseData));
+	ret = xmalloc(sizeof(PulseData));
 
 	ret->s = NULL;
 	ret->server = NULL;
@@ -78,8 +78,8 @@ static int pulse_initDriver(AudioOutput * audioOutput, ConfigParam * param)
 	}
 
 	pd = newPulseData();
-	pd->server = server ? strdup(server->value) : NULL;
-	pd->sink = sink ? strdup(sink->value) : NULL;
+	pd->server = server ? xstrdup(server->value) : NULL;
+	pd->sink = sink ? xstrdup(sink->value) : NULL;
 	audioOutput->data = pd;
 
 	return 0;
diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c
index 5c268930a..2cf2ba624 100644
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -74,7 +74,7 @@ typedef struct _ShoutData {
 
 static ShoutData *newShoutData(void)
 {
-	ShoutData *ret = malloc(sizeof(ShoutData));
+	ShoutData *ret = xmalloc(sizeof(ShoutData));
 
 	ret->shoutConn = shout_new();
 	ret->opened = 0;