zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-01-31 13:40:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Do explicit check for ROM sample during fixup and check sample end before loop points

Browse source
This commit is contained in:
Marcus Weseloh 2018-03-24 18:23:42 +01:00
parent 1ec9d85225
commit 945214b582
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/sfloader/fluid_defsfont.c
View file

@ -3373,6 +3373,26 @@ fixup_sample (SFData * sf)
while (p)
{
sam = (SFSample *) (p->data);
/* ROM samples are unusable for us by definition, so simply ignore them. */
if (sam->sampletype & FLUID_SAMPLETYPE_ROM)
{
sam->start = sam->end = sam->loopstart = sam->loopend = 0;
p = fluid_list_next (p);
continue;
}
/* If end is over the sample data chunk or sam start is greater than 4
* less than the end (at least 4 samples).
* FIXME: where does this number 4 come from? */
if ((sam->end > total_samples) || (sam->start > (sam->end - 4)))
{
FLUID_LOG (FLUID_WARN, _("Sample '%s' start/end file positions are invalid,"
" disabling and will not be saved"), sam->name);
sam->start = sam->end = sam->loopstart = sam->loopend = 0;
p = fluid_list_next (p);
continue;
}
/* The SoundFont 2.4 spec defines the loopstart index as the first sample point of the loop */
invalid_loopstart = (sam->loopstart < sam->start) || (sam->loopstart >= sam->loopend);
@ -3384,21 +3404,6 @@ fixup_sample (SFData * sf)
invalid_loopend = (sam->loopend > total_samples) || (sam->loopstart >= sam->loopend);
loopend_end_mismatch = (sam->loopend > sam->end);
/* if sample is not a ROM sample and end is over the sample data chunk
or sam start is greater than 4 less than the end (at least 4 samples) */
if ((!(sam->sampletype & FLUID_SAMPLETYPE_ROM) && sam->end > total_samples)
|| sam->start > (sam->end - 4))
{
FLUID_LOG (FLUID_WARN, _("Sample '%s' start/end file positions are invalid,"
" disabling and will not be saved"), sam->name);
/* disable sample by setting all sample markers to 0 */
sam->start = sam->end = sam->loopstart = sam->loopend = 0;
p = fluid_list_next (p);
continue;
}
if (sam->sampletype & FLUID_SAMPLETYPE_OGG_VORBIS)
{