Skip to content

AudioDeviceManager: Avoid dereferencing null channel pointers #1708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
emezeske wants to merge 1 commit into
base: develop
Choose a base branch
from
+17 −7
Draft

AudioDeviceManager: Avoid dereferencing null channel pointers #1708

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,29 +102,36 @@ class CallbackMaxSizeEnforcer : public AudioIODeviceCallback
}

void audioDeviceIOCallbackWithContext (const float* const* inputChannelData,
[[maybe_unused]] int numInputChannels,
int numInputChannels,
float* const* outputChannelData,
[[maybe_unused]] int numOutputChannels,
int numOutputChannels,
int numSamples,
const AudioIODeviceCallbackContext& context) override
{
jassert ((int) storedInputChannels.size() == numInputChannels);
jassert ((int) storedOutputChannels.size() == numOutputChannels);

// A device whose active-channel bitsets disagree with the channel arrays
// it passes here leaves the tail of the stored vectors holding the null
// pointers that resize() default-constructed, so the counts sent on are
// the number of channels actually filled in below, not the vector sizes.
const auto numIns = jmin ((int) storedInputChannels.size(), numInputChannels);
const auto numOuts = jmin ((int) storedOutputChannels.size(), numOutputChannels);

int position = 0;

while (position < numSamples)
{
const auto blockLength = jmin (maximumSize, numSamples - position);

const auto addOffset = [position] (auto ptr) { return ptr + position; };
std::transform (inputChannelData, inputChannelData + numInputChannels, storedInputChannels .begin(), addOffset);
std::transform (outputChannelData, outputChannelData + numOutputChannels, storedOutputChannels.begin(), addOffset);
std::transform (inputChannelData, inputChannelData + numIns, storedInputChannels .begin(), addOffset);
std::transform (outputChannelData, outputChannelData + numOuts, storedOutputChannels.begin(), addOffset);

inner.audioDeviceIOCallbackWithContext (storedInputChannels.data(),
(int) storedInputChannels.size(),
numIns,
storedOutputChannels.data(),
(int) storedOutputChannels.size(),
numOuts,
blockLength,
context);

Expand Down Expand Up @@ -1295,8 +1302,11 @@ void AudioDeviceManager::LevelMeter::updateLevel (const float* const* channelDat
{
float s = 0;

// Channels that weren't specified in AudioIODevice::open() are
// passed as null pointers, as documented by AudioIODeviceCallback.
for (int i = 0; i < numChannels; ++i)
s += std::abs (channelData[i][j]);
if (auto* channel = channelData[i])
s += std::abs (channel[j]);

s /= (float) numChannels;

Expand Down