fix the overflow checks in snd_ogg to handle different input and output sampling...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10687 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/snd_modplug.c b/snd_modplug.c
index ec14ce95cd029edae5a1f50cf6aec971872f82e4..596b38ff75ab7d8e3a85da14a225dc285c6bd2b9 100644 (file)
--- a/snd_modplug.c
+++ b/snd_modplug.c
@@ -341,10 +341,10 @@ static const snd_buffer_t* ModPlug_FetchSound (void *sfxfetcher, void **chfetche
        // 1- to ensure we won't lose many samples during the resampling process
        // 2- to reduce calls to ModPlug_FetchSound to regulate workload
        newlength = (int)(per_sfx->format.speed*STREAM_BUFFER_FILL);
-       if (newlength + sb->nbframes > sb->maxframes)
+       if ((size_t) ((double) newlength * (double)sb->format.speed / (double)per_sfx->format.speed) + sb->nbframes > sb->maxframes)
        {
-               Con_Printf ("ModPlug_FetchSound: stream buffer overflow (%u sample frames / %u)\n",
-                                       sb->format.speed + sb->nbframes, sb->maxframes);
+               Con_Printf ("ModPlug_FetchSound: stream buffer overflow (%u + %u = %u sample frames / %u)\n",
+                                       (unsigned int) ((double) newlength * (double)sb->format.speed / (double)per_sfx->format.speed), sb->nbframes, (unsigned int) ((double) newlength * (double)sb->format.speed / (double)per_sfx->format.speed) + sb->nbframes, sb->maxframes);
                return NULL;
        }
        newlength *= factor; // convert from sample frames to bytes

diff --git a/snd_ogg.c b/snd_ogg.c
index e383655a176f29bfb96f87453daaa2ca7770e333..0ee16bab4bd7f70cfd64d7310b6b9ba8f72001d9 100644 (file)
--- a/snd_ogg.c
+++ b/snd_ogg.c
@@ -534,10 +534,11 @@ static const snd_buffer_t* OGG_FetchSound (void *sfxfetcher, void **chfetcherpoi
        // 1- to ensure we won't lose many samples during the resampling process
        // 2- to reduce calls to OGG_FetchSound to regulate workload
        newlength = (int)(per_sfx->format.speed*STREAM_BUFFER_FILL);
-       if (newlength + sb->nbframes > sb->maxframes)
+       // this is how much we FETCH...
+       if ((size_t) ((double) newlength * (double)sb->format.speed / (double)per_sfx->format.speed) + sb->nbframes > sb->maxframes)
        {
                Con_Printf ("OGG_FetchSound: stream buffer overflow (%u + %u = %u sample frames / %u)\n",
-                                       newlength, sb->nbframes, newlength + sb->nbframes, sb->maxframes);
+                                       (unsigned int) ((double) newlength * (double)sb->format.speed / (double)per_sfx->format.speed), sb->nbframes, (unsigned int) ((double) newlength * (double)sb->format.speed / (double)per_sfx->format.speed) + sb->nbframes, sb->maxframes);
                return NULL;
        }
        newlength *= factor; // convert from sample frames to bytes