Mercurial > audlegacy
changeset 1377:61d78065b630 trunk
[svn] - properly respect signedness in get_spc_info_().
| author | nenolod |
|---|---|
| date | Sun, 09 Jul 2006 22:59:20 -0700 |
| parents | c71e2ef2dcf4 |
| children | 27d9eb18c7cf |
| files | ChangeLog Plugins/Input/console/Audacious_Driver.cpp Plugins/Input/console/Spc_Emu.h |
| diffstat | 3 files changed, 25 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jul 08 08:29:18 2006 -0700 +++ b/ChangeLog Sun Jul 09 22:59:20 2006 -0700 @@ -1,3 +1,25 @@ +2006-07-08 15:29:18 +0000 Tony Vroon <chainsaw@gentoo.org> + revision [1666] + Security fixes from AdPlug CVS (their July 7 commit shortly before the secunia announcement). + + Changes: Modified: + +26 -6 trunk/Plugins/Input/adplug/core/cff.cpp + +2 -2 trunk/Plugins/Input/adplug/core/cff.h + +28 -16 trunk/Plugins/Input/adplug/core/dmo.cpp + +5 -2 trunk/Plugins/Input/adplug/core/dmo.h + +6 -1 trunk/Plugins/Input/adplug/core/dtm.cpp + +1 -1 trunk/Plugins/Input/adplug/core/dtm.h + +3 -7 trunk/Plugins/Input/adplug/core/fmopl.c + +5 -3 trunk/Plugins/Input/adplug/core/fprovide.h + +37 -6 trunk/Plugins/Input/adplug/core/mtk.cpp + +3 -3 trunk/Plugins/Input/adplug/core/mtk.h + +5 -2 trunk/Plugins/Input/adplug/core/opl.h + +40 -18 trunk/Plugins/Input/adplug/core/rix.cpp + +16 -15 trunk/Plugins/Input/adplug/core/rix.h + +10 -2 trunk/Plugins/Input/adplug/core/s3m.cpp + +13 -6 trunk/Plugins/Input/adplug/core/u6m.cpp + + 2006-07-07 19:42:32 +0000 Tony Vroon <chainsaw@gentoo.org> revision [1664] Modplug conftest fix by Christian "Joker" Birchinger from Gentoo.
--- a/Plugins/Input/console/Audacious_Driver.cpp Sat Jul 08 08:29:18 2006 -0700 +++ b/Plugins/Input/console/Audacious_Driver.cpp Sun Jul 09 22:59:20 2006 -0700 @@ -252,10 +252,9 @@ track_info_t* out ) { // decode length (can be in text or binary format) - char s [4] = { h.len_secs [0], h.len_secs [1], h.len_secs [2], 0 }; + unsigned const char s [4] = { h.len_secs [0], h.len_secs [1], h.len_secs [2], 0 }; int len_secs = (unsigned char) s [1] * 0x100 + s [0]; - if ( s [1] >= ' ' || (!s [1] && isdigit( s [0] )) ) - len_secs = atoi( s ); + if ( len_secs ) out->length = len_secs * 1000;
--- a/Plugins/Input/console/Spc_Emu.h Sat Jul 08 08:29:18 2006 -0700 +++ b/Plugins/Input/console/Spc_Emu.h Sun Jul 09 22:59:20 2006 -0700 @@ -35,7 +35,7 @@ char dumper [16]; char comment [32]; byte date [11]; - char len_secs [3]; + unsigned char len_secs [3]; byte fade_msec [5]; char author [32]; byte mute_mask;