sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check that the index passed to the curves arenot too crazy

Browse source
This commit is contained in:
Paul Fd 2020-04-06 01:22:14 +02:00
parent 61d1c568a8
commit fbb9ebabb2
3 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/sfizz/Config.h
View file

@ -56,6 +56,7 @@ namespace config {
constexpr size_t powerHistoryLength { 16 }; constexpr size_t powerHistoryLength { 16 };
constexpr float voiceStealingThreshold { 0.00001f }; constexpr float voiceStealingThreshold { 0.00001f };
constexpr uint16_t numCCs { 512 }; constexpr uint16_t numCCs { 512 };
constexpr int maxCurves { 256 };
constexpr int chunkSize { 1024 }; constexpr int chunkSize { 1024 };
constexpr int filtersInPool { maxVoices * 2 }; constexpr int filtersInPool { maxVoices * 2 };
constexpr int filtersPerVoice { 2 }; constexpr int filtersPerVoice { 2 };

6
src/sfizz/Curve.cpp
View file

@ -196,6 +196,12 @@ void CurveSet::addCurve(const Curve& curve, int explicitIndex)
{ {
std::unique_ptr<Curve>* slot; std::unique_ptr<Curve>* slot;
if (explicitIndex < -1)
return;
if (explicitIndex >= config::maxCurves)
return;
if (explicitIndex == -1) { if (explicitIndex == -1) {
if (_useExplicitIndexing) if (_useExplicitIndexing)
return; // reject implicit indices if any were explicit before return; // reject implicit indices if any were explicit before

11
tests/CurveT.cpp
View file

@ -199,6 +199,17 @@ TEST_CASE("[Curve] Add curves to CurveSet")
REQUIRE( curveSet.getCurve(4).evalCC7(0) == 1.0f ); REQUIRE( curveSet.getCurve(4).evalCC7(0) == 1.0f );
} }
TEST_CASE("[Curve] Add bad indices")
{
sfz::CurveSet curveSet;
curveSet.addCurve(sfz::Curve::buildPredefinedCurve(0), -2);
REQUIRE( curveSet.getNumCurves() == 0 );
curveSet.addCurve(sfz::Curve::buildPredefinedCurve(0), 256);
REQUIRE( curveSet.getNumCurves() == 0 );
curveSet.addCurve(sfz::Curve::buildPredefinedCurve(0), 512);
REQUIRE( curveSet.getNumCurves() == 0 );
}
TEST_CASE("[Curve] Default CurveSet") TEST_CASE("[Curve] Default CurveSet")
{ {
auto curveSet = sfz::CurveSet::createPredefined(); auto curveSet = sfz::CurveSet::createPredefined();