zdoom
/
fluidsynth
mirror of https://github.com/ZDoom/fluidsynth.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid num_samples from becoming negative (#653) 

For Soundfonts bigger 2GiB, num_samples becomes negative. When being passed to safe_fread() it's promoted to long long and when being passed to fread(), it's cast to size_t. Works fine in twos-complement, but still is not nice.
This commit is contained in:
Tom M 2020-06-08 09:24:23 +02:00 committed by GitHub
parent 0354196e43
commit e16ca05a58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sfloader/fluid_sffile.c
View File

@ -2379,9 +2379,11 @@ static int fluid_sffile_read_wav(SFData *sf, unsigned int start, unsigned int en
{
short *loaded_data = NULL;
char *loaded_data24 = NULL;
unsigned int num_samples;
int num_samples = (end + 1) - start;
fluid_return_val_if_fail(num_samples > 0, -1);
fluid_return_val_if_fail((end + 1) > start , -1);
num_samples = (end + 1) - start;
if((start * sizeof(short) > sf->samplesize) || (end * sizeof(short) > sf->samplesize))
{
@ -2413,7 +2415,7 @@ static int fluid_sffile_read_wav(SFData *sf, unsigned int start, unsigned int en
/* If this machine is big endian, byte swap the 16 bit samples */
if(FLUID_IS_BIG_ENDIAN)
{
int i;
unsigned int i;
for(i = 0; i < num_samples; i++)
{