pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug 3488 - Random crashes (because Memory overlap in audio converters detected by Valgrind)

Browse source 
Vitaly Novichkov

Okay, when I researched code and algorithm, I tried to replace condition "while(dst >= target)" with "while(dst > target)" and crashes are gone.
Seems on some moments it tries to write into the place before memory block begin, therefore phantom crashes appearing after some moments.
This commit is contained in:
Sam Lantinga 2016-11-13 00:09:02 -08:00
parent eb7fe9b34b
commit 460360285a
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/audio/SDL_audiotypecvt.c
View file

@ -239,7 +239,7 @@ SDL_Upsample_Arbitrary(SDL_AudioCVT *cvt, const int channels)
SDL_memcpy(sample, src, cpy);
SDL_memcpy(last_sample, src, cpy);
while (dst >= target) {
while (dst > target) {
SDL_memcpy(dst, sample, cpy);
dst -= 8;
eps += srcsize;
@ -320,7 +320,7 @@ SDL_Upsample_x2(SDL_AudioCVT *cvt, const int channels)
SDL_assert(channels <= 8);
SDL_memcpy(last_sample, src, cpy);
while (dst >= target) {
while (dst > target) {
for (i = 0; i < channels; i++) {
dst[i] = (float) ((((double)src[i]) + ((double)last_sample[i])) * 0.5);
}
@ -355,7 +355,7 @@ SDL_Upsample_x4(SDL_AudioCVT *cvt, const int channels)
SDL_assert(channels <= 8);
SDL_memcpy(last_sample, src, cpy);
while (dst >= target) {
while (dst > target) {
for (i = 0; i < channels; i++) {
dst[i] = (float) ((((double) src[i]) + (3.0 * ((double) last_sample[i]))) * 0.25);
}