[Fix] Instrument Synth: Always avoid ending up in endless loops if a synth script is longer than 65535 lines, even if it was not sanitized (e.g. global scripts).

sagamusix · sagamusix · commit 008e3e128984 · 2024-12-18T22:03:55.000Z
git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@22570 56274372-70c3-4bfc-bfc3-4c3a0b034d27
diff --git a/soundlib/InstrumentSynth.cpp b/soundlib/InstrumentSynth.cpp
@@ -307,7 +307,7 @@ void InstrumentSynth::States::State::NextTick(const Events &events, PlayState &p
 			while(!m_ticksRemain)
 			{
 				m_currentRow = m_nextRow;
-				if(m_currentRow >= events.size())
+				if(m_currentRow >= std::min(events.size(), static_cast<size_t>(STOP_ROW)))
 					break;
 				m_nextRow++;
 				if(EvaluateEvent(events[m_currentRow], playState, channel, sndFile, states))

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ void InstrumentSynth::States::State::NextTick(const Events &events, PlayState &p`
`307`	`307`	`while(!m_ticksRemain)`
`308`	`308`	`{`
`309`	`309`	`m_currentRow = m_nextRow;`
`310`		`- if(m_currentRow >= events.size())`
	`310`	`+ if(m_currentRow >= std::min(events.size(), static_cast<size_t>(STOP_ROW)))`
`311`	`311`	`break;`
`312`	`312`	`m_nextRow++;`
`313`	`313`	`if(EvaluateEvent(events[m_currentRow], playState, channel, sndFile, states))`