From b3d22fb59274a5f731897982e4b991ee1a1f57aa Mon Sep 17 00:00:00 2001 From: aanriot Date: Sun, 22 Apr 2007 13:21:11 +0000 Subject: [PATCH] fix a format string by keeping a place for the terminating NUL character. ok avsm@ --- x11/vlc/Makefile | 4 ++-- x11/vlc/patches/patch-modules_demux_ogg_c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 x11/vlc/patches/patch-modules_demux_ogg_c diff --git a/x11/vlc/Makefile b/x11/vlc/Makefile index 0f76910aca0..bd3f62b1733 100644 --- a/x11/vlc/Makefile +++ b/x11/vlc/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.48 2007/04/20 07:21:53 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.49 2007/04/22 13:21:11 aanriot Exp $ SHARED_ONLY= Yes COMMENT= "videolan client; multimedia player" V= 0.8.6 DISTNAME= vlc-${V} -PKGNAME= vlc-${V}p5 +PKGNAME= vlc-${V}p6 CATEGORIES= x11 MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${V}/ diff --git a/x11/vlc/patches/patch-modules_demux_ogg_c b/x11/vlc/patches/patch-modules_demux_ogg_c new file mode 100644 index 00000000000..53d47a2c907 --- /dev/null +++ b/x11/vlc/patches/patch-modules_demux_ogg_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-modules_demux_ogg_c,v 1.5 2007/04/22 13:21:12 aanriot Exp $ +--- modules/demux/ogg.c.orig Sun Apr 22 10:52:35 2007 ++++ modules/demux/ogg.c Sun Apr 22 10:53:24 2007 +@@ -1365,7 +1365,7 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_thi + uint8_t *p = memchr( &p_oggpacket->packet[42], '\r', + p_oggpacket->bytes - 1 ); + if( p && p[0] == '\r' && p[1] == '\n' ) +- sscanf( (char*)(&p_oggpacket->packet[42]), "%1024s\r\n", ++ sscanf( (char*)(&p_oggpacket->packet[42]), "%1023s\r\n", + content_type_string ); + } +