From 177a9eeed478bb9780c494ca1432c24eb733611e Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 8 Jul 2012 21:33:45 +0000 Subject: [PATCH] Fix a off-by-one issue with the VCD module. from Brad (maintainer) --- x11/vlc/Makefile | 3 ++- x11/vlc/patches/patch-modules_access_vcd_cdrom_c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 x11/vlc/patches/patch-modules_access_vcd_cdrom_c diff --git a/x11/vlc/Makefile b/x11/vlc/Makefile index 5fd76379496..2b30cb983e1 100644 --- a/x11/vlc/Makefile +++ b/x11/vlc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.153 2012/07/06 12:51:11 sthen Exp $ +# $OpenBSD: Makefile,v 1.154 2012/07/08 21:33:45 ajacoutot Exp $ SHARED_ONLY= Yes @@ -8,6 +8,7 @@ COMMENT-jack= JACK audio output module for VLC V= 2.0.2 DISTNAME= vlc-${V} PKGNAME-main= ${DISTNAME} +REVISION-main= 0 PKGNAME-jack= vlc-jack-${V} CATEGORIES= x11 MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${V}/ diff --git a/x11/vlc/patches/patch-modules_access_vcd_cdrom_c b/x11/vlc/patches/patch-modules_access_vcd_cdrom_c new file mode 100644 index 00000000000..f52f94a73ce --- /dev/null +++ b/x11/vlc/patches/patch-modules_access_vcd_cdrom_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-modules_access_vcd_cdrom_c,v 1.1 2012/07/08 21:33:45 ajacoutot Exp $ + +Fix off-by-one while scanning. + +--- modules/access/vcd/cdrom.c.orig Sun Jul 8 17:11:39 2012 ++++ modules/access/vcd/cdrom.c Sun Jul 8 17:11:52 2012 +@@ -819,7 +819,7 @@ static int OpenVCDImage( vlc_object_t * p_this, const + while( fgets( line, 1024, cuefile ) && i_tracks < INT_MAX-1 ) + { + /* look for a TRACK line */ +- char psz_dummy[9]; ++ char psz_dummy[10]; + if( !sscanf( line, "%9s", psz_dummy ) || strcmp(psz_dummy, "TRACK") ) + continue; +