RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-02 12:20:57 +00:00
Code Issues Releases Wiki Activity

coreaudio: reject descriptions with too many channels

Browse Source 
This is a fix attempt for #1279 and #1249.
This commit is contained in:
Stefano Pigozzi 2014-12-04 21:50:40 +01:00
parent c070d16093
commit 9faf482d89
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
audio/out/ao_coreaudio.c
View File

@ -410,6 +410,13 @@ bool ca_layout_to_mp_chmap(struct ao *ao, AudioChannelLayout *layout,
// to the waveextensible definition: this is the kind of // to the waveextensible definition: this is the kind of
// descriptions we process here. // descriptions we process here.
if (layout->mNumberChannelDescriptions > MP_NUM_CHANNELS) {
MP_VERBOSE(ao, "layout has too many descriptions (%u, max: %d)",
(unsigned) layout->mNumberChannelDescriptions,
MP_NUM_CHANNELS);
goto coreaudio_error;
}
for (int n = 0; n < layout->mNumberChannelDescriptions; n++) { for (int n = 0; n < layout->mNumberChannelDescriptions; n++) {
AudioChannelLabel label = layout->mChannelDescriptions[n].mChannelLabel; AudioChannelLabel label = layout->mChannelDescriptions[n].mChannelLabel;
uint8_t speaker = ca_label_to_mp_speaker_id(label); uint8_t speaker = ca_label_to_mp_speaker_id(label);