rpms/sox/devel sox-12.17.7-smp-overflow.patch, NONE, 1.1 sox.spec, 1.18, 1.19

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/sox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17786

Modified Files:
	sox.spec 
Added Files:
	sox-12.17.7-smp-overflow.patch 
Log Message:
overflow patch (#155224 upstream)


sox-12.17.7-smp-overflow.patch:
 smp.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE sox-12.17.7-smp-overflow.patch ---
diff -urN sox-12.17.7.orig/src/smp.c sox-12.17.7/src/smp.c
--- sox-12.17.7.orig/src/smp.c	2004-09-27 22:33:09.000000000 -0400
+++ sox-12.17.7/src/smp.c	2005-04-26 16:33:22.000000000 -0400
@@ -25,6 +25,7 @@
 #define NAMELEN    30           /* Size of Samplevision name */
 #define COMMENTLEN 60           /* Size of Samplevision comment, not shared */
 #define MIDI_UNITY 60           /* MIDI note number to play sample at unity */
+#define MARKERLEN  10           /* Size of Marker name */
 
 /* The header preceeding the sample data */
 struct smpheader {
@@ -45,7 +46,7 @@
 
 /* Samplevision marker definition structure */
 struct marker {
-        char name[10];          /* Ascii Marker name */
+        char name[MARKERLEN + 1]; /* Ascii Marker name */
         uint32_t position;      /* Sample Number, not byte number */
 };
 
@@ -92,11 +93,12 @@
                 ft->loops[i].count = trailer->loops[i].count;
         }
         for(i = 0; i < 8; i++) {        /* read the 8 markers */
-                if (st_read(ft, trailer->markers[i].name, 1, 10) != 10)
+                if (st_read(ft, trailer->markers[i].name, 1, MARKERLEN) != 10)
                 {
                     st_fail_errno(ft,ST_EHDR,"EOF in SMP");
                     return(ST_EOF);
                 }
+                trailer->markers[i].name[MARKERLEN] = 0;
                 st_readdw(ft, &(trailer->markers[i].position));
         }
         st_readb(ft, (unsigned char *)&(trailer->MIDInote));


Index: sox.spec
===================================================================
RCS file: /cvs/dist/rpms/sox/devel/sox.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sox.spec	18 Apr 2005 08:27:39 -0000	1.18
+++ sox.spec	26 Apr 2005 20:36:35 -0000	1.19
@@ -1,10 +1,11 @@
 Summary: A general purpose sound file conversion tool.
 Name: sox
 Version: 12.17.7
-Release: 1
+Release: 2
 License: LGPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/sox/sox-%{version}.tar.gz
+Patch0: sox-12.17.7-smp-overflow.patch
 URL: http://sox.sourceforge.net/
 BuildRequires: libvorbis-devel
 BuildRequires: alsa-lib-devel
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q 
+%patch0 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" %configure --with-gsm --includedir=%{_includedir}/sox
@@ -67,7 +69,10 @@
 %{_mandir}/man3/*
 
 %changelog
-* Sun Apr 17 2005 Warren Togami <wtogami at redhat.com 12.17.7-1
+* Tue Apr 26 2005 Warren Togami <wtogami at redhat.com> 12.17.7-2
+- overflow patch (#155224 upstream)
+
+* Sun Apr 17 2005 Warren Togami <wtogami at redhat.com> 12.17.7-1
 - 12.17.7
 - BR alsa-lib-devel (#155224 thias)