Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.7.git;a=commitdiff;h=17538a02a6f55edeac436b35bcb98c0d2b92aa45
commit 17538a02a6f55edeac436b35bcb98c0d2b92aa45 Author: voroskoi <[EMAIL PROTECTED]> Date: Sun Jan 20 13:33:06 2008 +0100 vlc-0.8.6-8sayshell1-x86_64 added SA28233.patch, closes #2682 diff --git a/source/xmultimedia-extra/vlc/FrugalBuild b/source/xmultimedia-extra/vlc/FrugalBuild index 01a994e..7cb76ec 100644 --- a/source/xmultimedia-extra/vlc/FrugalBuild +++ b/source/xmultimedia-extra/vlc/FrugalBuild @@ -4,7 +4,7 @@ pkgname=vlc pkgver=0.8.6 pkgextraver=c -pkgrel=7 +pkgrel=8sayshell1 pkgdesc="The cross-platform media player and streaming server." url="http://www.videolan.org/vlc/"; depends=('alsa-lib' 'dbus-glib>=0.71' 'hal>=0.5.7.1-3' 'libxml2' 'libdvdnav' 'libmad' 'libmatroska' \ @@ -18,12 +18,13 @@ groups=('xmultimedia-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download-sources.html|grep -m1 'Latest VLC'|sed 's/.*(\(.*\)).*/\1/;s/$pkgextraver//'" source=(http://download.videolan.org/pub/videolan/vlc/$pkgver$pkgextraver/$pkgname-$pkgver$pkgextraver.tar.bz2 \ - $pkgname-ffmpeg.diff $pkgname.desktop vlc-0.8.5-libintl.diff libdca.patch) -sha1sums=('aefaf7a039874930b3e7caf139d2ed5b5bbd0a56'\ - '888a02c9f81331fce1f6ee5f705ce68e5b486ffd'\ - '0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0'\ - '50bfbc12fc0ad94178b2e08df22a0b26da36c1d5'\ - 'edc3a14dfd9b022dca7593e006c324fa5cc17e48') + $pkgname-ffmpeg.diff $pkgname.desktop vlc-0.8.5-libintl.diff libdca.patch SA28233.patch) +sha1sums=('aefaf7a039874930b3e7caf139d2ed5b5bbd0a56' \ + '888a02c9f81331fce1f6ee5f705ce68e5b486ffd' \ + '0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0' \ + '50bfbc12fc0ad94178b2e08df22a0b26da36c1d5' \ + 'edc3a14dfd9b022dca7593e006c324fa5cc17e48' \ + '86ece3df5bf479c2c74f4a24ac3746b1bd7ef49d') build() { diff --git a/source/xmultimedia-extra/vlc/SA28233.patch b/source/xmultimedia-extra/vlc/SA28233.patch new file mode 100644 index 0000000..3909ea1 --- /dev/null +++ b/source/xmultimedia-extra/vlc/SA28233.patch @@ -0,0 +1,59 @@ +Timestamp: 12/24/07 17:42:08 +Author: courmisch +Message: [20715] is too large to be backported. Put buffer size limits instead. + +Timestamp: 06/30/07 00:41:49 +Author: fenrir +Message: + Fixed potential sscanf buffer overflow in : + * ParseMicroDvd? + * ParseSubRip? + * ParseSubViewer? + * ParseSSA + (Reported by Michal Luczaj) + + +Index: vlc-0.8.6d/modules/demux/subtitle.c +=================================================================== +--- vlc-0.8.6d.orig/modules/demux/subtitle.c ++++ vlc-0.8.6d/modules/demux/subtitle.c +@@ -723,8 +723,8 @@ next: + i_stop = 0; + + memset( buffer_text, '\0', MAX_LINE ); +- if( sscanf( s, "{%d}{}%[^\r\n]", &i_start, buffer_text ) == 2 || +- sscanf( s, "{%d}{%d}%[^\r\n]", &i_start, &i_stop, buffer_text ) == 3) ++ if( sscanf( s, "{%d}{}%8192[^\r\n]", &i_start, buffer_text ) == 2 || ++ sscanf( s, "{%d}{%d}%8192[^\r\n]", &i_start, &i_stop, buffer_text ) == 3) + { + break; + } +@@ -949,8 +949,8 @@ static int ParseSSA( demux_t *p_demux, + demux_sys_t *p_sys = p_demux->p_sys; + text_t *txt = &p_sys->txt; + +- char buffer_text[ 10 * MAX_LINE]; +- char buffer_text2[ 10 * MAX_LINE]; ++ char buffer_text[ 10 * MAX_LINE + 1]; ++ char buffer_text2[ 10 * MAX_LINE + 1]; + char *s; + int64_t i_start; + int64_t i_stop; +@@ -981,7 +981,7 @@ static int ParseSSA( demux_t *p_demux, + * Dialogue: Layer#,0:02:40.65,0:02:41.79,Wolf main,Cher,0000,0000,0000,,Et les enregistrements de ses ondes delta ? + */ + if( sscanf( s, +- "Dialogue: %[^,],%d:%d:%d.%d,%d:%d:%d.%d,%[^\r\n]", ++ "Dialogue: %[^,],%d:%d:%d.%d,%d:%d:%d.%d,%81920[^\r\n]", + buffer_text2, + &h1, &m1, &s1, &c1, + &h2, &m2, &s2, &c2, +@@ -1075,7 +1075,7 @@ static int ParseVplayer( demux_t *p_dem + i_start = 0; + + memset( buffer_text, '\0', MAX_LINE ); +- if( sscanf( p, "%d:%d:%d%[ :]%[^\r\n]", &h, &m, &s, &c, buffer_text ) == 5 ) ++ if( sscanf( p, "%d:%d:%d%[ :]%81920[^\r\n]", &h, &m, &s, &c, buffer_text ) == 5 ) + { + i_start = ( (int64_t)h * 3600*1000 + + (int64_t)m * 60*1000 + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
