changeset 143:e8f34254bc18 trunk

[svn] - overflow fixes for modplug (via Stanislav Brabec @ novell/suse).
author nenolod
date Sun, 29 Oct 2006 12:29:05 -0800
parents c0b31cf2c7cd
children 5dfc0e491ad3
files ChangeLog src/modplug/sndfile.cxx
diffstat 2 files changed, 39 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Oct 29 01:08:30 2006 -0700
+++ b/ChangeLog	Sun Oct 29 12:29:05 2006 -0800
@@ -1,3 +1,40 @@
+2006-10-29 09:08:30 +0000  Aaron Sheldon <asheldon@uiuc.edu>
+  revision [284]
+  Atari XL SAP.  This compiles anything but cleanly, but somehow still 
+  works.  No one will notice anyway, though.  What percentage of the 
+  population listens to Atari XL music? I don't have an answer to that, 
+  but I'd guess that Audacious' SAP plugin will be used by approximately 2 
+  people.
+  
+  trunk/src/sap/Makefile                |   29 
+  trunk/src/sap/doc/CHANGES             |   24 
+  trunk/src/sap/doc/COMPILATION         |   40 
+  trunk/src/sap/doc/CREDITS             |   16 
+  trunk/src/sap/doc/README              |   43 
+  trunk/src/sap/doc/README.audacious    |    7 
+  trunk/src/sap/doc/TODO                |    5 
+  trunk/src/sap/fileinfo.c              |  328 +++++++
+  trunk/src/sap/fileinfo.h              |   43 
+  trunk/src/sap/sap_plug.c              |  194 ++++
+  trunk/src/sap/sap_plug.h              |   47 +
+  trunk/src/sap/sapfile.c               |  364 +++++++
+  trunk/src/sap/sapfile.h               |   39 
+  trunk/src/sap/saplib/Makefile         |   14 
+  trunk/src/sap/saplib/legal.txt        |   11 
+  trunk/src/sap/saplib/pokey0.cpp       |  132 ++
+  trunk/src/sap/saplib/pokey1.cpp       |  102 ++
+  trunk/src/sap/saplib/pokeyNamespace.h |  665 ++++++++++++++
+  trunk/src/sap/saplib/sapCpu.cpp       | 1581 ++++++++++++++++++++++++++++++++++
+  trunk/src/sap/saplib/sapEngine.cpp    |  657 ++++++++++++++
+  trunk/src/sap/saplib/sapGlobals.h     |   89 +
+  trunk/src/sap/saplib/sapLib.h         |   19 
+  trunk/src/sap/saplib/sapPokey.cpp     |   64 +
+  trunk/src/sap/scripts/gen_symbols     |    4 
+  trunk/src/sap/syms                    |    1 
+  trunk/src/sap/version.h               |   21 
+  26 files changed, 4539 insertions(+)
+
+
 2006-10-29 08:38:56 +0000  Aaron Sheldon <asheldon@uiuc.edu>
   revision [282]
   The comment probably ought to say 'enable' since that's what the command 
--- a/src/modplug/sndfile.cxx	Sun Oct 29 01:08:30 2006 -0700
+++ b/src/modplug/sndfile.cxx	Sun Oct 29 12:29:05 2006 -0800
@@ -1079,10 +1079,11 @@
 UINT CSoundFile::ReadSample(MODINSTRUMENT *pIns, UINT nFlags, LPCSTR lpMemFile, DWORD dwMemLength)
 //------------------------------------------------------------------------------------------------
 {
-	UINT len = 0, mem = pIns->nLength+6;
+	UINT len = 0, mem;
 
 	if ((!pIns) || (pIns->nLength < 4) || (!lpMemFile)) return 0;
 	if (pIns->nLength > MAX_SAMPLE_LENGTH) pIns->nLength = MAX_SAMPLE_LENGTH;
+	mem = pIns->nLength+6;
 	pIns->uFlags &= ~(CHN_16BIT|CHN_STEREO);
 	if (nFlags & RSF_16BIT)
 	{