encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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 37696150e2
commit c13a077d15
1 changed files with 3 additions and 3 deletions
Show Stats 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(sample, src, cpy);
SDL_memcpy(last_sample, src, cpy); SDL_memcpy(last_sample, src, cpy);
while (dst >= target) { while (dst > target) {
SDL_memcpy(dst, sample, cpy); SDL_memcpy(dst, sample, cpy);
dst -= 8; dst -= 8;
eps += srcsize; eps += srcsize;
@ -320,7 +320,7 @@ SDL_Upsample_x2(SDL_AudioCVT *cvt, const int channels)
SDL_assert(channels <= 8); SDL_assert(channels <= 8);
SDL_memcpy(last_sample, src, cpy); SDL_memcpy(last_sample, src, cpy);
while (dst >= target) { while (dst > target) {
for (i = 0; i < channels; i++) { for (i = 0; i < channels; i++) {
dst[i] = (float) ((((double)src[i]) + ((double)last_sample[i])) * 0.5); 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_assert(channels <= 8);
SDL_memcpy(last_sample, src, cpy); SDL_memcpy(last_sample, src, cpy);
while (dst >= target) { while (dst > target) {
for (i = 0; i < channels; i++) { for (i = 0; i < channels; i++) {
dst[i] = (float) ((((double) src[i]) + (3.0 * ((double) last_sample[i]))) * 0.25); dst[i] = (float) ((((double) src[i]) + (3.0 * ((double) last_sample[i]))) * 0.25);
} }