[arch-commits] Commit in faad2/trunk (3 files)

[Eric Bélanger]

    Date: Monday, January 5, 2009 @ 23:59:12
  Author: eric
Revision: 23213

upgpkg: faad2 2.6.1-2
    Applied security patch

Added:
  faad2/trunk/faad2-2.6.1-main-overflow.patch
Modified:
  faad2/trunk/ChangeLog
  faad2/trunk/PKGBUILD

---------------------------------+
 ChangeLog                       |    5 +++++
 PKGBUILD                        |   17 +++++++++--------
 faad2-2.6.1-main-overflow.patch |   13 +++++++++++++
 3 files changed, 27 insertions(+), 8 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-01-05 15:05:55 UTC (rev 23212)
+++ ChangeLog	2009-01-06 04:59:12 UTC (rev 23213)
@@ -1,3 +1,8 @@
+2009-01-05  Eric Belanger  <eric at archlinux.org>
+
+	* faad2 2.6.1-2
+	* Applied security patch
+
 2008-07-19  Eric Belanger  <eric at archlinux.org>
 
 	* faad2 2.6.1-1

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-01-05 15:05:55 UTC (rev 23212)
+++ PKGBUILD	2009-01-06 04:59:12 UTC (rev 23213)
@@ -4,27 +4,27 @@
 
 pkgname=faad2
 pkgver=2.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="ISO AAC audio decoder"
 arch=('i686' 'x86_64')
 url="http://www.audiocoding.com/"
 license=('custom:GPL')
 depends=('glibc')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/faac/${pkgname}-${pkgver}.tar.gz 
-        faad2-2.6.1-libtool22.patch
-        faad2-2.6.1-broken-pipe.patch
-        faad2-2.6.1-implicitdeclar.patch
-	faad2-2.6.1-abi_has_changed.patch
-	LICENSE)
+source=(http://downloads.sourceforge.net/sourceforge/faac/${pkgname}-${pkgver}.tar.gz \
+        faad2-2.6.1-libtool22.patch faad2-2.6.1-broken-pipe.patch \
+        faad2-2.6.1-implicitdeclar.patch faad2-2.6.1-abi_has_changed.patch \
+	faad2-2.6.1-main-overflow.patch LICENSE)
 md5sums=('74e92df40c270f216a8305fc87603c8a' 'ca9515b6617d7fd060d0d172616eb192'\
          'bb6a345dd2e6c4df6609e6a374134066' 'bc43fd3f8cd582a8bc092b9b5e611865'\
-         '06e83633c609d20436794b62a382b3dc' 'b6a1c72534807b8a038b71e784f57e32')
+         '06e83633c609d20436794b62a382b3dc' '2f76d3c6a77a551cdb5113dd7be0188b'\
+         'b6a1c72534807b8a038b71e784f57e32')
 sha1sums=('b4ad33d3c4dfa6dbf3011a3da34c631926cabfad'
           'ca4ee04aa1757b8f9deeef52b5bf35dc823da844'
           '0b03728f40d00e552f738900e2f6215177af5417'
           'd4ab5d38c9b75ed6417529c4d1a7ca204293c224'
           'f7e9d89fc551e0b61a7b7555749ed7a3129a4ce8'
+          '3c1172e62198db30f0d7fbabff41b0b942947dee'
           '6225fd997671206f5222c4a86d9e092359552c43')
 
 build() {
@@ -33,6 +33,7 @@
   patch -p1 < ../faad2-2.6.1-broken-pipe.patch || return 1
   patch -p1 < ../faad2-2.6.1-implicitdeclar.patch || return 1
   patch -p1 < ../faad2-2.6.1-abi_has_changed.patch || return 1
+  patch -p1 < ../faad2-2.6.1-main-overflow.patch || return 1
 
   autoreconf -vif || return 1
   ./configure --prefix=/usr || return 1

Added: faad2-2.6.1-main-overflow.patch
===================================================================
--- faad2-2.6.1-main-overflow.patch	                        (rev 0)
+++ faad2-2.6.1-main-overflow.patch	2009-01-06 04:59:12 UTC (rev 23213)
@@ -0,0 +1,13 @@
+Index: faad2/frontend/main.c
+===================================================================
+--- faad2.orig/frontend/main.c
++++ faad2/frontend/main.c
+@@ -916,6 +916,8 @@ int decodeMP4file(char *mp4file, char *s
+                 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))
+                 {