Avoid num_samples from becoming negative (FluidSynth#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.
CartoonFan · Jun 8, 2020 · e16ca05 · e16ca05
1 parent 0354196
commit e16ca05
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/sfloader/fluid_sffile.c b/src/sfloader/fluid_sffile.c
@@ -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++)
         {