zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-12-04 10:01:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '2.1.x' into master

Browse source
This commit is contained in:
derselbst 2021-03-15 21:27:13 +01:00
commit 9ea6c75724
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/sfloader/fluid_sffile.c
View file

@ -1365,7 +1365,7 @@ static int load_pmod(SFData *sf, int size)
* ------------------------------------------------------------------- */ * ------------------------------------------------------------------- */
static int load_pgen(SFData *sf, int size) static int load_pgen(SFData *sf, int size)
{ {
fluid_list_t *p, *p2, *p3, *dup, **hz = NULL; fluid_list_t *p, *p2, *p3, *dup, **hz = NULL, *start_of_zone_list;
SFZone *z; SFZone *z;
SFGen *g; SFGen *g;
SFGenAmount genval; SFGenAmount genval;
@ -1379,7 +1379,7 @@ static int load_pgen(SFData *sf, int size)
/* traverse through all presets */ /* traverse through all presets */
gzone = FALSE; gzone = FALSE;
discarded = FALSE; discarded = FALSE;
p2 = ((SFPreset *)(p->data))->zone; start_of_zone_list = p2 = ((SFPreset *)(p->data))->zone;
if(p2) if(p2)
{ {
@ -1526,11 +1526,13 @@ static int load_pgen(SFData *sf, int size)
} }
else else
{ {
p2 = fluid_list_next(p2); /* advance to next zone before deleting the current list element */
/* previous global zone exists, discard */ /* previous global zone exists, discard */
FLUID_LOG(FLUID_WARN, "Preset '%s': Discarding invalid global zone", FLUID_LOG(FLUID_WARN, "Preset '%s': Discarding invalid global zone",
((SFPreset *)(p->data))->name); ((SFPreset *)(p->data))->name);
*hz = fluid_list_remove(*hz, p2->data); fluid_list_remove(start_of_zone_list, z);
delete_zone((SFZone *)fluid_list_get(p2)); delete_zone(z);
continue;
} }
} }
@ -1875,7 +1877,7 @@ static int load_imod(SFData *sf, int size)
/* load instrument generators (see load_pgen for loading rules) */ /* load instrument generators (see load_pgen for loading rules) */
static int load_igen(SFData *sf, int size) static int load_igen(SFData *sf, int size)
{ {
fluid_list_t *p, *p2, *p3, *dup, **hz = NULL; fluid_list_t *p, *p2, *p3, *dup, **hz = NULL, *start_of_zone_list;
SFZone *z; SFZone *z;
SFGen *g; SFGen *g;
SFGenAmount genval; SFGenAmount genval;
@ -1889,7 +1891,7 @@ static int load_igen(SFData *sf, int size)
/* traverse through all instruments */ /* traverse through all instruments */
gzone = FALSE; gzone = FALSE;
discarded = FALSE; discarded = FALSE;
p2 = ((SFInst *)(p->data))->zone; start_of_zone_list = p2 = ((SFInst *)(p->data))->zone;
if(p2) if(p2)
{ {
@ -2035,11 +2037,13 @@ static int load_igen(SFData *sf, int size)
} }
else else
{ {
p2 = fluid_list_next(p2); /* advance to next zone before deleting the current list element */
/* previous global zone exists, discard */ /* previous global zone exists, discard */
FLUID_LOG(FLUID_WARN, "Instrument '%s': Discarding invalid global zone", FLUID_LOG(FLUID_WARN, "Instrument '%s': Discarding invalid global zone",
((SFInst *)(p->data))->name); ((SFInst *)(p->data))->name);
*hz = fluid_list_remove(*hz, p2->data); fluid_list_remove(start_of_zone_list, z);
delete_zone((SFZone *)fluid_list_get(p2)); delete_zone(z);
continue;
} }
} }
@ -2419,6 +2423,14 @@ static int fluid_sffile_read_wav(SFData *sf, unsigned int start, unsigned int en
if(sf->fcbs->fread(loaded_data, num_samples * sizeof(short), sf->sffd) == FLUID_FAILED) if(sf->fcbs->fread(loaded_data, num_samples * sizeof(short), sf->sffd) == FLUID_FAILED)
{ {
#if FLUID_VERSION_CHECK(FLUIDSYNTH_VERSION_MAJOR, FLUIDSYNTH_VERSION_MINOR, FLUIDSYNTH_VERSION_MICRO) < FLUID_VERSION_CHECK(2,2,0)
if((int)(num_samples * sizeof(short)) < 0)
{
FLUID_LOG(FLUID_INFO,
"This SoundFont seems to be bigger than 2GB, which is not supported in this version of fluidsynth. "
"You need to use at least fluidsynth 2.2.0");
}
#endif
FLUID_LOG(FLUID_ERR, "Failed to read sample data"); FLUID_LOG(FLUID_ERR, "Failed to read sample data");
goto error_exit; goto error_exit;
} }