• 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
..
atomic Loading commit data...
audio Loading commit data...
core Loading commit data...
cpuinfo Loading commit data...
events Loading commit data...
file Loading commit data...
haptic Loading commit data...
joystick Loading commit data...
libm Loading commit data...
loadso Loading commit data...
main Loading commit data...
power Loading commit data...
render Loading commit data...
stdlib Loading commit data...
thread Loading commit data...
timer Loading commit data...
video Loading commit data...
SDL.c Loading commit data...
SDL_assert.c Loading commit data...
SDL_assert_c.h Loading commit data...
SDL_compat.c Loading commit data...
SDL_error.c Loading commit data...
SDL_error_c.h Loading commit data...
SDL_fatal.c Loading commit data...
SDL_fatal.h Loading commit data...
SDL_hints.c Loading commit data...
SDL_hints_c.h Loading commit data...
SDL_log.c Loading commit data...