biggy/serumalt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(mod): validate modulation matrix and macro inputs

Browse Source 
Add bounds, finiteness, and range clamping to addConnection and
addAssignment. Validate ValueTree types and property values in
fromValueTree before inserting, rejecting non-integer indices and
unknown source names. Run toValueTree through a validated copy to
ensure persisted state is always within constraints.
This commit is contained in:
biggy
2026-09-09 14:33:06 +02:00
parent 4748bfe768
commit e2e66457c2
2 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MacroControls.cpp
+26 -11
View File
@@ -5,10 +5,11 @@ namespace serum
bool MacroControls::addAssignment (int macro, ModTarget target, float depth)
{
macro = juce::jlimit (0, kNumMacros - 1, macro);
if (target == ModTarget::None || (int) assignments[(size_t) macro].size() >= kMaxAssignments)
if (macro < 0 || macro >= kNumMacros
|| (int) target < 0 || (int) target >= kNumModTargets
|| ! std::isfinite (depth) || (int) assignments[(size_t) macro].size() >= kMaxAssignments)
return false;
assignments[(size_t) macro].push_back ({ target, depth });
assignments[(size_t) macro].push_back ({ target, juce::jlimit (-1.0f, 1.0f, depth) });
return true;
}
@@ -40,12 +41,21 @@ juce::String MacroControls::macroName (int index)
juce::ValueTree MacroControls::toValueTree() const
{
MacroControls validated;
for (int m = 0; m < kNumMacros; ++m)
for (const auto& a : assignments[(size_t) m])
{
if ((int) validated.assignments[(size_t) m].size() >= kMaxAssignments)
break;
if (! validated.addAssignment (m, a.target, a.depth))
continue;
}
juce::ValueTree tree ("MACROS");
for (int m = 0; m < kNumMacros; ++m)
{
juce::ValueTree mac ("MACRO");
mac.setProperty ("index", m, nullptr);
for (const auto& a : assignments[(size_t) m])
for (const auto& a : validated.assignments[(size_t) m])
{
juce::ValueTree asg ("ASSIGN");
asg.setProperty ("target", modTargetToString (a.target), nullptr);
@@ -60,23 +70,28 @@ juce::ValueTree MacroControls::toValueTree() const
void MacroControls::fromValueTree (const juce::ValueTree& tree)
{
clear();
if (! tree.isValid())
if (! tree.hasType ("MACROS"))
return;
for (const auto& mac : tree)
{
if (! mac.hasType ("MACRO"))
continue;
const int index = juce::jlimit (0, kNumMacros - 1, (int) mac.getProperty ("index", 0));
const double savedIndex = (double) mac.getProperty ("index", -1);
if (! std::isfinite (savedIndex) || savedIndex < 0.0 || savedIndex >= kNumMacros
|| std::floor (savedIndex) != savedIndex)
continue;
const int index = (int) savedIndex;
for (const auto& asg : mac)
{
if ((int) assignments[(size_t) index].size() >= kMaxAssignments)
break;
if (! asg.hasType ("ASSIGN"))
continue;
MacroAssignment a;
a.target = modTargetFromString (asg.getProperty ("target").toString());
a.depth = (float) asg.getProperty ("depth", 0.0);
if (a.target != ModTarget::None)
assignments[(size_t) index].push_back (a);
if (! addAssignment (index,
modTargetFromString (asg.getProperty ("target").toString()),
(float) asg.getProperty ("depth", 0.0)))
continue;
}
}
}