Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-16 08:09:32 +02:00
Code Issues Releases Wiki Activity

Merge pull request from tenacityteam/cwe-770-fix

Browse Source 
Fix for unsafe `alloca` usage (CWE-770)

Signed-off-by: Emily Mabrey emabrey@tenacityaudio.org
Reference-to: https://github.com/tenacityteam/tenacity/pull/412
This commit is contained in:
Emily Mabrey 2021-07-30 02:24:32 -04:00 committed by GitHub
commit 047729727a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/AudioIO.cpp
View File

@ -3844,12 +3844,13 @@ bool AudioIoCallback::FillOutputBuffers(
// ------ MEMORY ALLOCATION ----------------------
// These are small structures.
WaveTrack **chans = (WaveTrack **) alloca(numPlaybackChannels * sizeof(WaveTrack *));
float **tempBufs = (float **) alloca(numPlaybackChannels * sizeof(float *));
auto chans = new WaveTrack * [numPlaybackChannels];
auto tempBufs = new float* [numPlaybackChannels];
// And these are larger structures....
for (unsigned int c = 0; c < numPlaybackChannels; c++)
tempBufs[c] = (float *) alloca(framesPerBuffer * sizeof(float));
for (unsigned int c = 0; c < numPlaybackChannels; c++) {
tempBufs[c] = new float[framesPerBuffer];
}
// ------ End of MEMORY ALLOCATION ---------------
auto & em = RealtimeEffectManager::Get();
@ -4001,6 +4002,8 @@ bool AudioIoCallback::FillOutputBuffers(
if (outputMeterFloats != outputFloats)
ClampBuffer( outputMeterFloats, framesPerBuffer*numPlaybackChannels );
delete[] chans;
delete[] tempBufs;
return false;
}

19
src/effects/RealtimeEffectManager.cpp
View File

@ -323,15 +323,15 @@ size_t RealtimeEffectManager::RealtimeProcess(int group, unsigned chans, float *
wxMilliClock_t start = wxGetUTCTimeMillis();
// Allocate the in/out buffer arrays
float **ibuf = (float **) alloca(chans * sizeof(float *));
float **obuf = (float **) alloca(chans * sizeof(float *));
auto ibuf = new float* [chans];
auto obuf = new float* [chans];
// And populate the input with the buffers we've been given while allocating
// NEW output buffers
for (unsigned int i = 0; i < chans; i++)
{
ibuf[i] = buffers[i];
obuf[i] = (float *) alloca(numSamples * sizeof(float));
obuf[i] = new float[numSamples];
}
// Now call each effect in the chain while swapping buffer pointers to feed the
@ -366,6 +366,9 @@ size_t RealtimeEffectManager::RealtimeProcess(int group, unsigned chans, float *
}
}
delete ibuf;
delete[] obuf;
// Remember the latency
mRealtimeLatency = (int) (wxGetUTCTimeMillis() - start).GetValue();
@ -516,9 +519,10 @@ size_t RealtimeEffectState::RealtimeProcess(int group,
const auto numAudioIn = mEffect.GetAudioInCount();
const auto numAudioOut = mEffect.GetAudioOutCount();
float **clientIn = (float **) alloca(numAudioIn * sizeof(float *));
float **clientOut = (float **) alloca(numAudioOut * sizeof(float *));
float *dummybuf = (float *) alloca(numSamples * sizeof(float));
auto clientIn = new float* [numAudioIn];
auto clientOut = new float* [numAudioOut];
auto dummybuf = new float [numSamples];
decltype(numSamples) len = 0;
auto ichans = chans;
auto ochans = chans;
@ -613,6 +617,9 @@ size_t RealtimeEffectState::RealtimeProcess(int group,
// Bump to next processor
processor++;
}
delete[] clientIn;
delete[] clientOut;
delete[] dummybuf;
return len;
}