gme: fix playback of GYM files loaded from memory.

vitamin-caig · Nov 20, 2024 · 02e8cc1 · 02e8cc1
1 parent 849a5e4
commit 02e8cc1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/3rdparty/gme/gme/Gym_Emu.cpp b/3rdparty/gme/gme/Gym_Emu.cpp
@@ -306,7 +306,7 @@ void Gym_Emu::parse_frame()
 		loop_begin = pos; // find loop on first time through sequence
 
 	int cmd;
-	while ( (cmd = *pos++) != 0 )
+	while ( pos < data_end && (cmd = *pos++) != 0 )
 	{
 		int data = *pos++;
 		if ( cmd == 1 )

diff --git a/3rdparty/gme/gme/Music_Emu.h b/3rdparty/gme/gme/Music_Emu.h
@@ -239,7 +239,7 @@ inline void Music_Emu::remute_voices()              { mute_voices( mute_mask_ );
 inline void Music_Emu::ignore_silence( bool b )     { ignore_silence_ = b; }
 inline blargg_err_t Music_Emu::start_track_( int track )
 {
-	if ( type()->track_count == 1 )
+	if ( type()->track_count == 1 && track > 0)
 		return load_mem_( track_pos( track ), track_size( track ) );
 	return 0;
 }