Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8d4272cba4bf778f4b557409120c3d533fbcbc47

commit 8d4272cba4bf778f4b557409120c3d533fbcbc47
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date:   Wed Jul 23 22:59:08 2008 +0200

ffmpeg-20080427-5-i686
- added CVE-2008-3162.patch
- closes #3252

diff --git a/source/xmultimedia/ffmpeg/CVE-2008-3162.patch 
b/source/xmultimedia/ffmpeg/CVE-2008-3162.patch
new file mode 100644
index 0000000..1c919a2
--- /dev/null
+++ b/source/xmultimedia/ffmpeg/CVE-2008-3162.patch
@@ -0,0 +1,54 @@
+Index: libavformat/psxstr.c
+===================================================================
+--- libavformat/psxstr.c       (revision 13992)
++++ libavformat/psxstr.c       (revision 13993)
+@@ -274,12 +274,23 @@
+                 int current_sector = AV_RL16(&sector[0x1C]);
+                 int sector_count   = AV_RL16(&sector[0x1E]);
+                 int frame_size = AV_RL32(&sector[0x24]);
+-                int bytes_to_copy;
++
++                if(!(   frame_size>=0
++                     && current_sector < sector_count
++                     && sector_count*VIDEO_DATA_CHUNK_SIZE >=frame_size)){
++                    av_log(s, AV_LOG_ERROR, "Invalid parameters %d %d %d\n", 
current_sector, sector_count, frame_size);
++                    return AVERROR_INVALIDDATA;
++                }
++
+ //        printf("%d %d %d\n",current_sector,sector_count,frame_size);
+                 /* if this is the first sector of the frame, allocate a pkt */
+                 pkt = &str->tmp_pkt;
+-                if (current_sector == 0) {
+-                    if (av_new_packet(pkt, frame_size))
++
++                if(pkt->size != sector_count*VIDEO_DATA_CHUNK_SIZE){
++                    if(pkt->data)
++                        av_log(s, AV_LOG_ERROR, "missmatching 
sector_count\n");
++                    av_free_packet(pkt);
++                    if (av_new_packet(pkt, 
sector_count*VIDEO_DATA_CHUNK_SIZE))
+                         return AVERROR(EIO);
+
+                     pkt->pos= url_ftell(pb) - RAW_CD_SECTOR_SIZE;
+@@ -293,15 +304,15 @@
+                        str->pts += (90000 / 15);
+                 }
+
+-                /* load all the constituent chunks in the video packet */
+-                bytes_to_copy = frame_size - 
current_sector*VIDEO_DATA_CHUNK_SIZE;
+-                if (bytes_to_copy>0) {
+-                    if (bytes_to_copy>VIDEO_DATA_CHUNK_SIZE) 
bytes_to_copy=VIDEO_DATA_CHUNK_SIZE;
+-                    memcpy(pkt->data + current_sector*VIDEO_DATA_CHUNK_SIZE,
+-                        sector + VIDEO_DATA_HEADER_SIZE, bytes_to_copy);
+-                }
++                memcpy(pkt->data + current_sector*VIDEO_DATA_CHUNK_SIZE,
++                       sector + VIDEO_DATA_HEADER_SIZE,
++                       VIDEO_DATA_CHUNK_SIZE);
++
+                 if (current_sector == sector_count-1) {
++                    pkt->size= frame_size;
+                     *ret_pkt = *pkt;
++                    pkt->data= NULL;
++                    pkt->size= -1;
+                     return 0;
+                 }
+
diff --git a/source/xmultimedia/ffmpeg/FrugalBuild 
b/source/xmultimedia/ffmpeg/FrugalBuild
index 1ae924d..1b76f94 100644
--- a/source/xmultimedia/ffmpeg/FrugalBuild
+++ b/source/xmultimedia/ffmpeg/FrugalBuild
@@ -3,7 +3,7 @@

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

# TODO: --enable-swscale (ATM it breaks too much app)
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to