Merge pull request #4535 from Memphiz/fixchannelmap

[osxsink] - fix bad access when device announces more then 8 channels - ...

diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
index b539244..07a877c 100644 (file)
--- a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
@@ -513,7 +513,7 @@ bool CAESinkDARWINOSX::Initialize(AEAudioFormat &format, std::string &device)
   { /* update the channel count.  We assume that they're layed out as given in CAChannelMap.
        if they're not, this is plain wrong */
     format.m_channelLayout.Reset();
-    for (unsigned int i = 0; i < outputFormat.mChannelsPerFrame; i++)
+    for (unsigned int i = 0; i < outputFormat.mChannelsPerFrame && i < CA_MAX_CHANNELS; i++)
       format.m_channelLayout += CAChannelMap[i];
   }