[Frugalware-git] frugalware-0.9: ffmpeg-20080427-8solaria1-i686

Miklos Vajna vmiklos at frugalware.org
Sun Mar 8 13:54:47 CET 2009


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=5e6508fd27822db64d94d778ba82783a164c5627

commit 5e6508fd27822db64d94d778ba82783a164c5627
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Fri Jan 30 05:30:23 2009 +0100

ffmpeg-20080427-8solaria1-i686

- backport r16846
- closes #3599
(cherry picked from commit 831df530792bf721415a316b2187c2e52bfbe74f)

diff --git a/source/xmultimedia/ffmpeg/FrugalBuild b/source/xmultimedia/ffmpeg/FrugalBuild
index ef31d1c..0c046f2 100644
--- a/source/xmultimedia/ffmpeg/FrugalBuild
+++ b/source/xmultimedia/ffmpeg/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=ffmpeg
pkgver=20080427
-pkgrel=7
+pkgrel=8solaria1
pkgdesc="FFMpeg is a complete and free Internet live audio and vide  broadcasting solution for Linux/Unix."
url="http://ffmpeg.sourceforge.net/"
depends=('a52dec' 'amrnb' 'amrwb' 'faac' 'lame' 'libtheora' 'libvorbis' 'x264>=20080426' 'xvidcore' 'libdc1394' 'imlib2' 'sdl' 'faad2' 'gsm')
@@ -12,9 +12,10 @@ groups=('xmultimedia')
archs=('i686' 'x86_64')
up2date=$pkgver
source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-$pkgver.tar.bz2 \
-	CVE-2008-3162.patch)
+	CVE-2008-3162.patch r16846.patch)
sha1sums=('d3e42f4e307f5ed83ed877421b8f16f9c74c046b' \
-          '2113ab53babc732e44f11fb62a48ec4f51040b19')
+          '2113ab53babc732e44f11fb62a48ec4f51040b19' \
+          'e4c28fa466118d07a3f7d8376b725eda2e196e21')

# TODO / WARNING: with --enable-swscale some apps may have some problems but without
#                 one isn't able to compile a lot other apps -- FIXME --
diff --git a/source/xmultimedia/ffmpeg/r16846.patch b/source/xmultimedia/ffmpeg/r16846.patch
new file mode 100644
index 0000000..374ce33
--- /dev/null
+++ b/source/xmultimedia/ffmpeg/r16846.patch
@@ -0,0 +1,19 @@
+diff --git a/libavformat/4xm.c b/libavformat/4xm.c
+index 151e9c9..41b4834 100644
+--- a/libavformat/4xm.c
++++ b/libavformat/4xm.c
+@@ -163,10 +163,12 @@ static int fourxm_read_header(AVFormatContext *s,
+                 return AVERROR_INVALIDDATA;
+             }
+             current_track = AV_RL32(&header[i + 8]);
++            if((unsigned)current_track >= UINT_MAX / sizeof(AudioTrack) -1) {
++                av_log(s, AV_LOG_ERROR, "current_track too large\n");
++                return -1;
++            }
+             if (current_track + 1 > fourxm->track_count) {
+                 fourxm->track_count = current_track + 1;
+-                if((unsigned)fourxm->track_count >= UINT_MAX / sizeof(AudioTrack))
+-                    return -1;
+                 fourxm->tracks = av_realloc(fourxm->tracks,
+                     fourxm->track_count * sizeof(AudioTrack));
+                 if (!fourxm->tracks) {


More information about the Frugalware-git mailing list