summaryrefslogtreecommitdiff
path: root/community/mplayer2
diff options
context:
space:
mode:
Diffstat (limited to 'community/mplayer2')
-rw-r--r--community/mplayer2/PKGBUILD15
-rw-r--r--community/mplayer2/mplayer2-SAMI-subs.patch12
2 files changed, 23 insertions, 4 deletions
diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD
index a39946560..7f012d00b 100644
--- a/community/mplayer2/PKGBUILD
+++ b/community/mplayer2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56005 2011-09-28 18:33:51Z stephane $
+# $Id: PKGBUILD 56845 2011-10-14 19:26:53Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Bartek Piotrowski <barthalion@gmail.com>
pkgname=mplayer2
pkgver=2.0
-pkgrel=14
+pkgrel=15
pkgdesc="A movie player"
arch=('i686' 'x86_64')
license=('GPL')
@@ -17,9 +17,11 @@ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
provides=('mplayer')
conflicts=('mplayer')
source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz
- mplayer2-remove-mp3lib.patch)
+ mplayer2-remove-mp3lib.patch
+ mplayer2-SAMI-subs.patch)
sha1sums=('0df8d4e5484128b7b28029273b7704ab5d5419bc'
- 'c55128a99406a5e01ab077555b7b24aa7b54110c')
+ 'c55128a99406a5e01ab077555b7b24aa7b54110c'
+ '4059d5d0564004feb55d25b5f62f7f4672e40fb1')
options=('!emptydirs')
build() {
@@ -33,6 +35,11 @@ build() {
rm -fr mp3lib
patch -Np1 -i ../mplayer2-remove-mp3lib.patch
+ # SAMI subtitle parsing buffer overflow
+ # http://mplayerhq.hu/pipermail/mplayer-cvslog/2011-May/042075.html
+ # http://labs.mwrinfosecurity.com/files/Advisories/mwri_mplayer-sami-subtitles_2011-08-12.pdf
+ patch -Np1 -i ../mplayer2-SAMI-subs.patch
+
./configure --prefix=/usr \
--enable-runtime-cpudetection \
--disable-arts \
diff --git a/community/mplayer2/mplayer2-SAMI-subs.patch b/community/mplayer2/mplayer2-SAMI-subs.patch
new file mode 100644
index 000000000..8238167e2
--- /dev/null
+++ b/community/mplayer2/mplayer2-SAMI-subs.patch
@@ -0,0 +1,12 @@
+diff -Naur mplayer2-2.0.ori/sub/subreader.c mplayer2-2.0/sub/subreader.c
+--- mplayer2-2.0.ori/sub/subreader.c 2011-03-24 17:40:29.000000000 -0400
++++ mplayer2-2.0/sub/subreader.c 2011-10-14 15:04:47.196477670 -0400
+@@ -179,6 +179,8 @@
+ break;
+
+ case 3: /* get all text until '<' appears */
++ if (p - text >= LINE_LEN)
++ sami_add_line(current, text, &p);
+ if (*s == '\0') break;
+ else if (!strncasecmp (s, "<br>", 4)) {
+ sami_add_line(current, text, &p);