Sun Aug 9 12:18:17 2009 UTC ()

add fix for SA26156
Bump PKGREVISION


(kefren)

diff -r1.79 -r1.80 pkgsrc/multimedia/vlc/Makefile
diff -r1.28 -r1.29 pkgsrc/multimedia/vlc/distinfo
diff -r0 -r1.7 pkgsrc/multimedia/vlc/patches/patch-aa

--- pkgsrc/multimedia/vlc/Makefile 2009/07/22 09:01:39 1.79
+++ pkgsrc/multimedia/vlc/Makefile 2009/08/09 12:18:17 1.80

@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.79 2009/07/22 09:01:39 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2009/08/09 12:18:17 kefren Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
 CATEGORIES=		multimedia
+PKGREVISION=		1
 MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
 EXTRACT_SUFX=		.tar.bz2

--- pkgsrc/multimedia/vlc/distinfo 2009/07/07 16:17:47 1.28
+++ pkgsrc/multimedia/vlc/distinfo 2009/08/09 12:18:17 1.29

@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.28 2009/07/07 16:17:47 tnn Exp $
+$NetBSD: distinfo,v 1.29 2009/08/09 12:18:17 kefren Exp $
 
 SHA1 (vlc-1.0.0.tar.bz2) = fff08528d97d26f6f7faeafba94b445e0e3562e8
 RMD160 (vlc-1.0.0.tar.bz2) = 7d0ed52c580c75d09003788f5a2d27b7de18b410
 Size (vlc-1.0.0.tar.bz2) = 19973964 bytes
+SHA1 (patch-aa) = 49157d57e4e7755be87b22234d6c04ef997f91b6
 SHA1 (patch-configure) = 88a32710eea4987975839bf982d7a6958b977a5c
 SHA1 (patch-v4l2) = 1f91206f8e2f78514056386977a6c2230a710211

--- modules/access/rtsp/real.c.orig	2009-08-09 13:00:43.000000000 +0300
+++ modules/access/rtsp/real.c	2009-08-09 13:01:54.000000000 +0300
@@ -592,6 +592,8 @@ int real_get_rdt_chunk(rtsp_client_t *rt
 
   int n;
   rmff_dump_pheader(ph, (char*)*buffer);
+  if (ph->length < 12)
+	return 0;
   n=rtsp_read_data(rtsp_session, (uint8_t*)(*buffer + 12), ph->length - 12);
   return (n <= 0) ? 0 : n+12;
 }