- timidity++: better handling of soundfont terminal preset record

ZDoom · Jun 8, 2020 · 9d71752 · 9d71752
1 parent e8b2bd4
commit 9d71752
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/thirdparty/timidityplus/sndfont.cpp b/thirdparty/timidityplus/sndfont.cpp
@@ -267,15 +267,16 @@ void Instruments::init_sf(SFInsts *rec)
 		return;
 	}
 
-	if(load_soundfont(&sfinfo, rec->tf))
+	// SoundFont spec, 7.2: ... contains a minimum of two records, one record for each preset and one for a terminal record
+	if(load_soundfont(&sfinfo, rec->tf) || sfinfo.npresets < 2)
 	{
 	    end_soundfont(rec);
 	    return;
 	}
 
 	correct_samples(&sfinfo);
 	current_sfrec = rec;
-	for (i = 0; i < sfinfo.npresets; i++) {
+	for (i = 0; i < sfinfo.npresets - 1; i++) {
 		int bank = sfinfo.preset[i].bank;
 		int preset = sfinfo.preset[i].preset;