[OMPT-svn-commit] OpenMPT r20269 - in branches/OpenMPT-1.31: . mptrack

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

Author: sagamusix
Date: Thu Mar  7 18:56:09 2024
New Revision: 20269
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20269

Log:
Merged revision(s) 20268 from trunk/OpenMPT:
[Fix] Avoid out-of-bounds span access in sample preview (only an issue in debug builds).
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/MainFrm.cpp

Modified: branches/OpenMPT-1.31/mptrack/MainFrm.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/MainFrm.cpp	Thu Mar  7 18:55:36 2024	(r20268)
+++ branches/OpenMPT-1.31/mptrack/MainFrm.cpp	Thu Mar  7 18:56:09 2024	(r20269)
@@ -1685,9 +1685,10 @@
 			m[0].instr = 1;
 		}
 		// Infinite loop on second row
-		m[1 * 2].command = CMD_POSITIONJUMP;
-		m[1 * 2 + 1].command = CMD_PATTERNBREAK;
-		m[1 * 2 + 1].param = 1;
+		m = m_WaveFile.Patterns[0].GetRow(1);
+		m[0].command = CMD_POSITIONJUMP;
+		m[1].command = CMD_PATTERNBREAK;
+		m[1].param = 1;
 	}
 	m_WaveFile.InitPlayer(true);
 }