Mercurial > audlegacy
changeset 1511:543e37d18997 trunk
[svn] Remove 15 instrument magic at offset 1080 because of false positive resulting in decoder segfault. Closes bug #543.
| author | chainsaw |
|---|---|
| date | Sun, 06 Aug 2006 06:24:06 -0700 |
| parents | c9ac8b6679c9 |
| children | 56f1f0f7437d |
| files | ChangeLog Plugins/Input/modplug/modplugbmp.cpp Plugins/Input/modplug/modplugbmp.h |
| diffstat | 3 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Aug 06 05:45:48 2006 -0700 +++ b/ChangeLog Sun Aug 06 06:24:06 2006 -0700 @@ -1,3 +1,11 @@ +2006-08-06 12:45:48 +0000 Giacomo Lozito <james@develia.org> + revision [1934] + - a couple of fixes for notify plugin (removed some deprecated gtk+1 functions and ensure that the timeout is removed only if it actually exists) + + Changes: Modified: + +3 -2 trunk/Plugins/General/notify/notify.c + + 2006-08-06 09:52:27 +0000 Stephen Sokolow <deitarion@gmail.com> revision [1932] Added awareness of the difference between stopped and playing.
--- a/Plugins/Input/modplug/modplugbmp.cpp Sun Aug 06 05:45:48 2006 -0700 +++ b/Plugins/Input/modplug/modplugbmp.cpp Sun Aug 06 06:24:06 2006 -0700 @@ -192,10 +192,6 @@ vfs_fclose(file); return 1; } - if (!memcmp(magic, MOD_MAGIC_15INSTRUMENT, 4)) { - vfs_fclose(file); - return 1; - } } /* end of if(mModProps.mGrabAmigaMOD) */ /* We didn't find the magic bytes, fall back to extension check */
--- a/Plugins/Input/modplug/modplugbmp.h Sun Aug 06 05:45:48 2006 -0700 +++ b/Plugins/Input/modplug/modplugbmp.h Sun Aug 06 06:24:06 2006 -0700 @@ -31,7 +31,6 @@ #define MOD_MAGIC_OKTALYZER8X (unsigned char [4]) { 0x4F, 0x4B, 0x54, 0x41 } // "OKTA" - Atari oktalyzer 8 channel #define MOD_MAGIC_TAKETRACKER16 (unsigned char [4]) { 0x31, 0x36, 0x43, 0x4E } // "16CN" - Taketracker 16 channel #define MOD_MAGIC_TAKETRACKER32 (unsigned char [4]) { 0x33, 0x32, 0x43, 0x4E } // "32CN" - Taketracker 32 channel -#define MOD_MAGIC_15INSTRUMENT (unsigned char [4]) { 0x20, 0x20, 0x20, 0x20 } // " " - 15-instrument 4 channel #define S3M_MAGIC (unsigned char [4]) { 0x53, 0x43, 0x52, 0x4D } /* This is the SCRM string at offset 44 to 47 in the S3M header */