summaryrefslogtreecommitdiff
path: root/multimedia/vlc
diff options
context:
space:
mode:
authorkefren <kefren>2008-02-28 16:18:53 +0000
committerkefren <kefren>2008-02-28 16:18:53 +0000
commitab550625630a97dd8263bd41e94e4db8d88fb930 (patch)
treed1f6f3166c4ebb9e32ea8d3dc6543f59efb21541 /multimedia/vlc
parent138a51af7653599b8a3e963ad8f7a8bd9470e25b (diff)
downloadpkgsrc-ab550625630a97dd8263bd41e94e4db8d88fb930.tar.gz
Fix SA29122: MP4 Demuxer Arbitrary Memory Overwrite
Diffstat (limited to 'multimedia/vlc')
-rw-r--r--multimedia/vlc/Makefile4
-rw-r--r--multimedia/vlc/distinfo3
-rw-r--r--multimedia/vlc/patches/patch-ad18
3 files changed, 22 insertions, 3 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index acb3d0d551a..38ac1ad0e21 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.48 2008/02/25 16:38:00 sborrill Exp $
+# $NetBSD: Makefile,v 1.49 2008/02/28 16:18:53 kefren Exp $
#
DISTNAME= vlc-${VLC_VER}
CATEGORIES= multimedia
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/
EXTRACT_SUFX= .tar.bz2
-PKGREVISION= 1
+PKGREVISION= 2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.videolan.org/
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index d23904c3753..81224ce4920 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2008/02/20 13:11:00 xtraeme Exp $
+$NetBSD: distinfo,v 1.14 2008/02/28 16:18:53 kefren Exp $
SHA1 (vlc-0.8.6d.tar.bz2) = 63afd15cc782795c8d8f3de5edc614389465c577
RMD160 (vlc-0.8.6d.tar.bz2) = 16c1998dbc30ad96bebdd8792d135b5f7899166e
@@ -6,3 +6,4 @@ Size (vlc-0.8.6d.tar.bz2) = 11170003 bytes
SHA1 (patch-aa) = 497a83bb0f1e2c095a81aa84115e66b56dd47e2c
SHA1 (patch-ab) = c311b82c00f1eea164189a9759c9ca576faec671
SHA1 (patch-ac) = 54526feb8f88cd1f61e40abd62ed5f68ce6b934b
+SHA1 (patch-ad) = dd92aeabc8d21ebf4113558b9d63f7737add2d91
diff --git a/multimedia/vlc/patches/patch-ad b/multimedia/vlc/patches/patch-ad
new file mode 100644
index 00000000000..7baf9f89a27
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.5 2008/02/28 16:18:53 kefren Exp $
+Index: modules/demux/mp4/mp4.c
+===================================================================
+--- modules/demux/mp4/mp4.c (revision 24943)
++++ modules/demux/mp4/mp4.c (revision 24944)
+@@ -1151,6 +1151,12 @@
+ for( i_chunk = p_stsc->data.p_stsc->i_first_chunk[i_index] - 1;
+ i_chunk < i_last; i_chunk++ )
+ {
++ if( i_chunk >= p_demux_track->i_chunk_count )
++ {
++ msg_Warn( p_demux, "corrupted chunk table" );
++ return VLC_EGENERIC;
++ }
++
+ p_demux_track->chunk[i_chunk].i_sample_description_index =
+ p_stsc->data.p_stsc->i_sample_description_index[i_index];
+ p_demux_track->chunk[i_chunk].i_sample_count =