From 2919f4e11ed01cb8cb003aebbc47fc46ddd60c9b Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Mon, 20 Dec 2004 12:39:54 +0000
Subject: Added check to prevent queueing invalid songs, and thus reading
 OOB...

svn-id: r16160
---
 queen/music.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'queen')

diff --git a/queen/music.cpp b/queen/music.cpp
index 9988026ebf..3a2cd770eb 100644
--- a/queen/music.cpp
+++ b/queen/music.cpp
@@ -80,6 +80,13 @@ static const byte mt32_to_gm[128] = {
 	}
 	
 	bool MusicPlayer::queueSong(uint16 songNum) {
+		if (songNum >= _numSongs) {
+			// this happens at the end of the car chase, where we try to play song 176,
+			// see Sound::_tune[], entry 39
+			warning("Trying to queue an invalid song number %d, max %d", songNum, _numSongs);
+			return false;
+		}
+
 		uint8 emptySlots = 0;
 		for (int i = 0; i < MUSIC_QUEUE_SIZE; i++)
 			if (!_songQueue[i])
@@ -257,7 +264,7 @@ static const byte mt32_to_gm[128] = {
 		if (!songNum) {
 			stopMusic();
 			return;
-		}	
+		}
 
 		byte *musicPtr = _musicData + songOffset(songNum);
 		uint32 size = songLength(songNum);
-- 
cgit v1.2.3