cpp/openttd-patchpack/source Changeset - r26381:4f81dd601633

Changeset - r26381:4f81dd601633

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

PeterN - 2 years ago 2022-09-21 07:31:59
peter1138@openttd.org

Fix #10038: Missing upper bounds check when loading custom playlists (#10039)

1 file changed with 2 insertions and 2 deletions:

src/music_gui.cpp

0 comments (0 inline, 0 general)

src/music_gui.cpp

➞

Show inline comments

@@ @@ -127,11 +127,11 @@ void MusicSystem::BuildPlaylists() @@
 	/* Load custom playlists
 	 * Song index offsets are 1-based, zero indicates invalid/end-of-list value */
 	for (uint i = 0; i < NUM_SONGS_PLAYLIST; i++) {
 		if (_settings_client.music.custom_1[i] > 0) {
+		if (_settings_client.music.custom_1[i] > 0 && _settings_client.music.custom_1[i] <= NUM_SONGS_AVAILABLE) {
 			PlaylistEntry entry(set, _settings_client.music.custom_1[i] - 1);
 			if (entry.IsValid()) this->standard_playlists[PLCH_CUSTOM1].push_back(entry);
+		}
 		if (_settings_client.music.custom_2[i] > 0) {
+		if (_settings_client.music.custom_2[i] > 0 && _settings_client.music.custom_2[i] <= NUM_SONGS_AVAILABLE) {
 			PlaylistEntry entry(set, _settings_client.music.custom_2[i] - 1);
 			if (entry.IsValid()) this->standard_playlists[PLCH_CUSTOM2].push_back(entry);
+		}

0 comments (0 inline, 0 general)