Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-01 15:43:44 +02:00
Code Issues Releases Wiki Activity

check the loop boundary before dereferncing the array to avoid an out-of-bounds access. Patch by Campbell Barton with revisions suggested by Alan Horstmann

Browse Source
This commit is contained in:
RichardAsh1981@gmail.com 2013-09-18 19:46:47 +00:00
parent 3e8e94767c
commit 81f6306d7f
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/effects/Equalization.cpp
View File

@ -1195,10 +1195,8 @@ void EqualizationDialog::MakeEqualizationDialog()
szrG = new wxBoxSizer( wxHORIZONTAL ); szrG = new wxBoxSizer( wxHORIZONTAL );
szrG->Add(0, 0, 0); // horizontal spacer, will be used to position LH EQ slider szrG->Add(0, 0, 0); // horizontal spacer, will be used to position LH EQ slider
for (int i = 0; thirdOct[i] <= mHiFreq; ++i) for (int i = 0; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i)
{ {
if( i == NUMBER_OF_BANDS )
break;
m_sliders[i] = new wxSliderBugfix(this, ID_SLIDER + i, 0, -20, +20, m_sliders[i] = new wxSliderBugfix(this, ID_SLIDER + i, 0, -20, +20,
wxDefaultPosition, wxSize(20, 124), wxSL_VERTICAL| wxDefaultPosition, wxSize(20, 124), wxSL_VERTICAL|
wxSL_INVERSE); wxSL_INVERSE);
@ -1965,10 +1963,8 @@ void EqualizationDialog::WriteXML(XMLWriter &xmlFile)
void EqualizationDialog::OnSlider(wxCommandEvent & event) void EqualizationDialog::OnSlider(wxCommandEvent & event)
{ {
wxSliderBugfix *s = (wxSliderBugfix *)event.GetEventObject(); wxSliderBugfix *s = (wxSliderBugfix *)event.GetEventObject();
for (int i = 0; thirdOct[i] <= mHiFreq; ++i) for (int i = 0; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i)
{ {
if( i == NUMBER_OF_BANDS )
break;
if( s == m_sliders[i]) if( s == m_sliders[i])
{ {
int posn = m_sliders[i]->GetValue(); int posn = m_sliders[i]->GetValue();
@ -2041,10 +2037,8 @@ void EqualizationDialog::LayoutEQSliders()
double loLog = log10(mLoFreq); double loLog = log10(mLoFreq);
double hiLog = log10(mHiFreq); double hiLog = log10(mHiFreq);
double denom = hiLog - loLog; double denom = hiLog - loLog;
for (int i = 1; thirdOct[i] <= mHiFreq; ++i) //go along the spacers for (int i = 1; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i) //go along the spacers
{ {
if( i == NUMBER_OF_BANDS )
break;
float posn = range*(log10(thirdOct[i])-loLog)/denom; //centre of this slider, from start float posn = range*(log10(thirdOct[i])-loLog)/denom; //centre of this slider, from start
w = start + ((int)(posn+.5)) - EQsliderSize.x/2; //LH edge of slider, from 0 w = start + ((int)(posn+.5)) - EQsliderSize.x/2; //LH edge of slider, from 0
w = w - so_far; //gap needed to put it here w = w - so_far; //gap needed to put it here
@ -2618,10 +2612,8 @@ void EqualizationDialog::OnInvert(wxCommandEvent & WXUNUSED(event)) // Inverts a
{ {
if(!drawMode) // Graphic (Slider) mode. Invert the sliders. if(!drawMode) // Graphic (Slider) mode. Invert the sliders.
{ {
for (int i = 0; thirdOct[i] <= mHiFreq; ++i) for (int i = 0; (i < NUMBER_OF_BANDS) && (thirdOct[i] <= mHiFreq); ++i)
{ {
if( i == NUMBER_OF_BANDS )
break;
m_EQVals[i] = -m_EQVals[i]; m_EQVals[i] = -m_EQVals[i];
int newPosn = (int)m_EQVals[i]; int newPosn = (int)m_EQVals[i];
m_sliders[i]->SetValue( newPosn ); m_sliders[i]->SetValue( newPosn );