[OMPT-svn-commit] OpenMPT r20533 - trunk/OpenMPT/soundlib

[<sv...@op...>]

Author: sagamusix
Date: Mon Apr  8 20:39:23 2024
New Revision: 20533
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20533

Log:
[Fix] Possible crash when merging sequences.

Modified:
   trunk/OpenMPT/soundlib/ModSequence.cpp

Modified: trunk/OpenMPT/soundlib/ModSequence.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/ModSequence.cpp	Mon Apr  8 20:16:25 2024	(r20532)
+++ trunk/OpenMPT/soundlib/ModSequence.cpp	Mon Apr  8 20:39:23 2024	(r20533)
@@ -497,6 +497,7 @@
 		firstSeq.reserve(firstOrder + lengthTrimmed);
 		firstSeq.push_back(); // Separator item
 		RestartPosToPattern(seqNum);
+		patternsFixed.resize(m_sndFile.Patterns.Size(), SEQUENCEINDEX_INVALID);  // Previous line might have increased pattern count
 		for(ORDERINDEX ord = 0; ord < lengthTrimmed; ord++)
 		{
 			PATTERNINDEX pat = seq[ord];
@@ -535,6 +536,7 @@
 		}
 	}
 	m_Sequences.erase(m_Sequences.begin() + 1, m_Sequences.end());
+	m_currentSeq = 0;
 	return true;
 }