2 files changed, 3 insertions, 1 deletions
diff --git a/src/decode.c b/src/decode.c
index 4ed0b6151..410eb8c04 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -342,6 +342,8 @@ static void * decoder_task(void *arg)
 			decoder_sleep(dc);
 		}
 	}
+
+	return NULL;
 }
 
 void decoderInit(DecoderControl * dc)
diff --git a/src/inputStream_http.c b/src/inputStream_http.c
index e633b7a66..51e3b63f3 100644
--- a/src/inputStream_http.c
+++ b/src/inputStream_http.c
@@ -721,7 +721,7 @@ int inputStream_httpSeek(InputStream * inStream, long offset, int whence)
 
 static void parseIcyMetadata(InputStream * inStream, char *metadata, int size)
 {
-	char *r;
+	char *r = NULL;
 	char *s;
 	char *temp = xmalloc(size + 1);
 	memcpy(temp, metadata, size);