• Sam Lantinga's avatar
    Fixed bug 1091 - Hardcoded size in SDL_audiocvt.c may lead to heap/stack corruption · 7e2e5d34
    Sam Lantinga authored
    Markovtsev Vadim 2011-01-18 22:00:16 PST
    
    SDL_audiocvt.c:
    
    static void SDLCALL
    SDL_ConvertStereo(SDL_AudioCVT * cvt, SDL_AudioFormat format):
    
    #define dup_chans_1_to_2(type) \
        { \
            const type *src = (const type *) (cvt->buf + cvt->len_cvt); \
            type *dst = (type *) (cvt->buf + cvt->len_cvt * 2); \
            for (i = cvt->len_cvt / 2; i; --i, --src) { \
                const type val = *src; \
                dst -= 2; \
                dst[0] = dst[1] = val; \
            } \
        }
    
    Pay attention to cvt->len_cvt / 2. 2 is the sizeof(Uint16), hovewer, below we
    see that the conversion function supports Uint8 and Uint32:
    
    switch (SDL_AUDIO_BITSIZE(format)) {
        case 8:
            dup_chans_1_to_2(Uint8);
            break;
        case 16:
            dup_chans_1_to_2(Uint16);
            break;
        case 32:
            dup_chans_1_to_2(Uint32);
            break;
        }
    
    If type is Uint32, src will be decreased twice as it should be, memory being
    written before the cvt->buf. If type is Uint8, the conversion will not be
    complete. I suggest to change that define to
    
    #define dup_chans_1_to_2(type) \
        { \
            const type *src = (const type *) (cvt->buf + cvt->len_cvt); \
            type *dst = (type *) (cvt->buf + cvt->len_cvt * 2); \
            for (i = cvt->len_cvt / sizeof(type); i; --i, --src) { \
                const type val = *src; \
                dst -= 2; \
                dst[0] = dst[1] = val; \
            } \
        }
    
    I tested that and now it's working fine. I did not consider the similar defines
    in functions nearby.
    7e2e5d34
Name
Last commit
Last update
..
alsa Loading commit data...
android Loading commit data...
arts Loading commit data...
baudio Loading commit data...
bsd Loading commit data...
coreaudio Loading commit data...
directsound Loading commit data...
disk Loading commit data...
dsp Loading commit data...
dummy Loading commit data...
esd Loading commit data...
fusionsound Loading commit data...
nas Loading commit data...
nds Loading commit data...
paudio Loading commit data...
pulseaudio Loading commit data...
qsa Loading commit data...
sun Loading commit data...
winmm Loading commit data...
xaudio2 Loading commit data...
SDL_audio.c Loading commit data...
SDL_audio_c.h Loading commit data...
SDL_audiocvt.c Loading commit data...
SDL_audiodev.c Loading commit data...
SDL_audiodev_c.h Loading commit data...
SDL_audiomem.h Loading commit data...
SDL_audiotypecvt.c Loading commit data...
SDL_mixer.c Loading commit data...
SDL_sysaudio.h Loading commit data...
SDL_wave.c Loading commit data...
SDL_wave.h Loading commit data...
sdlgenaudiocvt.pl Loading commit data...