Skip to content

Backport #3810: bounds check iChanID before array access (release/3_12) #3840

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

Open
mcfnord wants to merge 2 commits into
base: release/3_12
Choose a base branch
from
Open

Backport #3810: bounds check iChanID before array access (release/3_12) #3840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29a13e4
Add MathUtils::InRange (backport util.h portion of #3741, #3812)
Jul 29, 2026
f018042
Add bounds check iChanID before array access
ann0see Jul 20, 2026
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
9 changes: 6 additions & 3 deletions src/audiomixerboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1349,9 +1349,12 @@ void CAudioMixerBoard::ApplyNewConClientList ( CVector<CChannelInfo>& vecChanInf

for ( size_t iFader = 0; iFader < iNumConnectedClients; iFader++ )
{
// ideally "iChanID" in CChannelInfo would be size_t if it can never be INVALID_INDEX
// as assumed here
iFaderNumber[vecChanInfo[iFader].iChanID] = static_cast<int> ( iFader );
const int iChanID = vecChanInfo[iFader].iChanID;

if ( MathUtils::InRange<int> ( iChanID, 0, MAX_NUM_CHANNELS ) )
{
iFaderNumber[iChanID] = static_cast<int> ( iFader );
}
}

// Hide all unused faders and initialize used ones
Expand Down
7 changes: 7 additions & 0 deletions src/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,6 +1222,13 @@ class MathUtils
return powf ( 10.0f, ( fInValueRange0_1 - 1.0f ) * AUD_MIX_FADER_RANGE_DB / 20.0f );
}
}

// Returns true if value is in [lower, upper) (inclusive lower, exclusive upper).
template<typename T>
static inline bool InRange ( T value, T lower /* inclusive */, T upper /* exclusive */ )
{
return value >= lower && value < upper;
}
};

/******************************************************************************\
Expand Down