[44984] trunk/dports/audio/faad2

[jmr at macports.org]

Revision: 44984
          http://trac.macports.org/changeset/44984
Author:   jmr at macports.org
Date:     2009-01-05 20:03:33 -0800 (Mon, 05 Jan 2009)
Log Message:
-----------
faad2: patch for buffer overflow in front end

Modified Paths:
--------------
    trunk/dports/audio/faad2/Portfile

Added Paths:
-----------
    trunk/dports/audio/faad2/files/main_overflow.diff

Modified: trunk/dports/audio/faad2/Portfile
===================================================================
--- trunk/dports/audio/faad2/Portfile	2009-01-06 03:58:38 UTC (rev 44983)
+++ trunk/dports/audio/faad2/Portfile	2009-01-06 04:03:33 UTC (rev 44984)
@@ -4,6 +4,7 @@
 
 name		faad2
 version		2.6.1
+revision	1
 categories	audio
 maintainers	pguyot at kallisys.net openmaintainer
 description	Fastest ISO AAC audio decoder.
@@ -19,7 +20,7 @@
 			sha1	b4ad33d3c4dfa6dbf3011a3da34c631926cabfad \
 			rmd160	ad559933dad6a65576a9947819190f04cb3b1c16
 worksrcdir	${name}
-patchfiles	patch-Makefile.am patch-configure.in
+patchfiles	patch-Makefile.am patch-configure.in main_overflow.diff
 
 depends_build	port:libtool \
 				port:autoconf \

Added: trunk/dports/audio/faad2/files/main_overflow.diff
===================================================================
--- trunk/dports/audio/faad2/files/main_overflow.diff	                        (rev 0)
+++ trunk/dports/audio/faad2/files/main_overflow.diff	2009-01-06 04:03:33 UTC (rev 44984)
@@ -0,0 +1,17 @@
+--- frontend/main.c	2007-11-01 13:33:30.000000000 -0700
++++ frontend/main.c	2008-09-16 11:01:40.000000000 -0700
+@@ -911,12 +911,14 @@
+             if (sampleId == 0) dur = 0;
+ 
+             if (useAacLength || (timescale != samplerate)) {
+                 sample_count = frameInfo.samples;
+             } else {
+                 sample_count = (unsigned int)(dur * frameInfo.channels);
++                if (sample_count > frameInfo.samples)
++                    sample_count = frameInfo.samples;
+ 
+                 if (!useAacLength && !initial && (sampleId < numSamples/2) && (sample_count != frameInfo.samples))
+                 {
+                     faad_fprintf(stderr, "MP4 seems to have incorrect frame duration, using values from AAC data.\n");
+                     useAacLength = 1;
+                     sample_count = frameInfo.samples;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090105/88772bc8/attachment.html>