Fixed playListIndex's type and potential overflow.

SpintroniK · Aug 5, 2019 · b70ed24 · b70ed24
1 parent 2c5a1cb
commit b70ed24
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Sound/Mixer/Mixer.cpp b/Sound/Mixer/Mixer.cpp
@@ -47,7 +47,14 @@ namespace Sound
 		{
 			// Add sound to playList
 			//playList.emplace_back(id, volume, true);
-			const auto index = playListIndex.fetch_add(1, std::memory_order_relaxed); // FIXME: protect from overflow
+			const auto index = playListIndex.fetch_add(1, std::memory_order_relaxed);
+
+			// Protect from overflow (ignore new sound...)
+			if(index >= playList.size())
+			{
+				return;
+			}
+
 			playList[index].id = id;
 			playList[index].volume = volume;
 			playList[index].isPlaying.store(true, std::memory_order_release);

diff --git a/Sound/Mixer/Mixer.h b/Sound/Mixer/Mixer.h
@@ -43,7 +43,7 @@ namespace Sound
 
 		std::shared_ptr<SoundBank> soundBank;
 		std::array<SoundState, 256> playList;
-		std::atomic<int> playListIndex{0};
+		std::atomic<size_t> playListIndex{0};
 
 	};