From 57f7b01ee485e95ea5db4d92c6f335741e8ff256 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 19 Jan 2008 16:41:35 +0000
Subject: Cached file must be 0-terminated since we use string processing
 functions on it

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25805 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 stream/stream_cddb.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'stream')

diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c
index 70c21eb43e..be6ac9269b 100644
--- a/stream/stream_cddb.c
+++ b/stream/stream_cddb.c
@@ -338,10 +338,10 @@ cddb_read_cache(cddb_data_t *cddb_data) {
 		perror("fstat");
 		file_size = 4096;
 	} else {
-		file_size = stats.st_size;
+		file_size = stats.st_size < UINT_MAX ? stats.st_size : UINT_MAX - 1;
 	}
 	
-	cddb_data->xmcd_file = malloc(file_size);
+	cddb_data->xmcd_file = malloc(file_size+1);
 	if( cddb_data->xmcd_file==NULL ) {
 		mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MemAllocFailed);
 		close(file_fd);
@@ -353,6 +353,7 @@ cddb_read_cache(cddb_data_t *cddb_data) {
 		close(file_fd);
 		return -1;
 	}
+	cddb_data->xmcd_file[cddb_data->xmcd_file_size] = 0;
 	
 	close(file_fd);
 	
-- 
cgit v1.2.3