diff --git a/src/decoder_api.c b/src/decoder_api.c
index dd7096017..eba2387c3 100644
--- a/src/decoder_api.c
+++ b/src/decoder_api.c
@@ -27,9 +27,11 @@
 #include "normalize.h"
 #include "pipe.h"
 
-#include <assert.h>
 #include <glib.h>
 
+#include <assert.h>
+#include <stdlib.h>
+
 void decoder_initialized(struct decoder * decoder,
 			 const struct audio_format *audio_format,
 			 bool seekable, float total_time)
@@ -239,9 +241,8 @@ decoder_data(struct decoder *decoder,
 			pcm_convert_size(&dc.in_audio_format, length,
 					 &dc.out_audio_format);
 		if (out_length > conv_buffer_size) {
-			if (conv_buffer != NULL)
-				free(conv_buffer);
-			conv_buffer = xmalloc(out_length);
+			g_free(conv_buffer);
+			conv_buffer = g_malloc(out_length);
 			conv_buffer_size = out_length;
 		}