[pkgsrc/trunk]: pkgsrc/multimedia/vlc Fix SA29122: MP4 Demuxer Arbitrary Memo...

[kefren <kefren%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5b0013885e80
branches:  trunk
changeset: 539132:5b0013885e80
user:      kefren <kefren%pkgsrc.org@localhost>
date:      Thu Feb 28 16:18:53 2008 +0000

description:
Fix SA29122: MP4 Demuxer Arbitrary Memory Overwrite

diffstat:

 multimedia/vlc/Makefile         |   4 ++--
 multimedia/vlc/distinfo         |   3 ++-
 multimedia/vlc/patches/patch-ad |  18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diffs (53 lines):

diff -r f06c4ff42518 -r 5b0013885e80 multimedia/vlc/Makefile
--- a/multimedia/vlc/Makefile   Thu Feb 28 15:27:46 2008 +0000
+++ b/multimedia/vlc/Makefile   Thu Feb 28 16:18:53 2008 +0000
@@ -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@localhost
 HOMEPAGE=              http://www.videolan.org/
diff -r f06c4ff42518 -r 5b0013885e80 multimedia/vlc/distinfo
--- a/multimedia/vlc/distinfo   Thu Feb 28 15:27:46 2008 +0000
+++ b/multimedia/vlc/distinfo   Thu Feb 28 16:18:53 2008 +0000
@@ -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 @@
 SHA1 (patch-aa) = 497a83bb0f1e2c095a81aa84115e66b56dd47e2c
 SHA1 (patch-ab) = c311b82c00f1eea164189a9759c9ca576faec671
 SHA1 (patch-ac) = 54526feb8f88cd1f61e40abd62ed5f68ce6b934b
+SHA1 (patch-ad) = dd92aeabc8d21ebf4113558b9d63f7737add2d91
diff -r f06c4ff42518 -r 5b0013885e80 multimedia/vlc/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/vlc/patches/patch-ad   Thu Feb 28 16:18:53 2008 +0000
@@ -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 =