• Sam Lantinga's avatar
    Fixed bug 1014 - SDL_ConvertAudio crashes · a9bcdb83
    Sam Lantinga authored
    The patch Mark attached looks good and valgrind gives it a clean bill of health:
    
    Mark.Howson@ntu.ac.uk 2010-12-15 07:45:25 PST
    
    Reproducible here under Windows and Linux. Looking at the code for
    SDL_Upsample_S16LSB_2c:
    
    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 2;
    const Sint16 *target = ((const Sint16 *) cvt->buf) - 2;
    while (dst > target) {
       dst[1] = ((Sint16) SDL_SwapLE16(sample1));
       dst[0] = ((Sint16) SDL_SwapLE16(sample0));
       dst -= 2;
    ...
    
    if dstsize is odd (and therefore dst), it'll write to target[1] which is one
    byte before the allocated buf.
    
    The attached patch to sdlgenaudiocvt.pl changes dst > target to dst >= target,
    and removes the - $channels for the upsample case. The patch is not fully
    tested, but seems to work here.
    a9bcdb83
Name
Last commit
Last update
VisualC Loading commit data...
Xcode Loading commit data...
Xcode-iOS Loading commit data...
acinclude Loading commit data...
android-project Loading commit data...
build-scripts Loading commit data...
include Loading commit data...
src Loading commit data...
test Loading commit data...
.DISABLED-hgeol Loading commit data...
.hgignore Loading commit data...
.hgtags Loading commit data...
.indent.pro Loading commit data...
Android.mk Loading commit data...
BUGS Loading commit data...
Borland.html Loading commit data...
Borland.zip Loading commit data...
COPYING Loading commit data...
CREDITS Loading commit data...
INSTALL Loading commit data...
Makefile.ds Loading commit data...
Makefile.in Loading commit data...
Makefile.minimal Loading commit data...
Makefile.pandora Loading commit data...
Makefile.wiz Loading commit data...
NOTES Loading commit data...
README Loading commit data...
README-SDL.txt Loading commit data...
README.BeOS Loading commit data...
README.DirectFB Loading commit data...
README.HG Loading commit data...
README.MacOSX Loading commit data...
README.Platforms Loading commit data...
README.Porting Loading commit data...
README.Watcom Loading commit data...
README.WinCE Loading commit data...
README.android Loading commit data...
README.ds Loading commit data...
README.gesture Loading commit data...
README.iOS Loading commit data...
README.pandora Loading commit data...
README.touch Loading commit data...
SDL.spec.in Loading commit data...
TODO Loading commit data...
UNDER_CONSTRUCTION.txt Loading commit data...
VisualC.html Loading commit data...
Watcom-Win32.zip Loading commit data...
WhatsNew Loading commit data...
aclocal.m4 Loading commit data...
autogen.sh Loading commit data...
configure Loading commit data...
configure.in Loading commit data...
sdl-config.in Loading commit data...
sdl.m4 Loading commit data...
sdl.pc.in Loading commit data...