head	1.8;
access;
symbols
	pkgsrc-2013Q2:1.8.0.10
	pkgsrc-2013Q2-base:1.8
	pkgsrc-2012Q4:1.8.0.8
	pkgsrc-2012Q4-base:1.8
	pkgsrc-2011Q4:1.8.0.6
	pkgsrc-2011Q4-base:1.8
	pkgsrc-2011Q2:1.8.0.4
	pkgsrc-2011Q2-base:1.8
	pkgsrc-2009Q4:1.8.0.2
	pkgsrc-2009Q4-base:1.8
	pkgsrc-2009Q3:1.7.0.18
	pkgsrc-2009Q3-base:1.7
	pkgsrc-2009Q2:1.7.0.16
	pkgsrc-2009Q2-base:1.7
	pkgsrc-2009Q1:1.7.0.14
	pkgsrc-2009Q1-base:1.7
	pkgsrc-2008Q4:1.7.0.12
	pkgsrc-2008Q4-base:1.7
	pkgsrc-2008Q3:1.7.0.10
	pkgsrc-2008Q3-base:1.7
	cube-native-xorg:1.7.0.8
	cube-native-xorg-base:1.7
	pkgsrc-2008Q2:1.7.0.6
	pkgsrc-2008Q2-base:1.7
	cwrapper:1.7.0.4
	pkgsrc-2008Q1:1.7.0.2
	pkgsrc-2008Q1-base:1.7
	pkgsrc-2007Q4:1.6.0.2
	pkgsrc-2007Q4-base:1.6
	pkgsrc-2007Q3:1.5.0.6
	pkgsrc-2007Q3-base:1.5
	pkgsrc-2007Q2:1.5.0.4
	pkgsrc-2007Q2-base:1.5
	pkgsrc-2007Q1:1.5.0.2
	pkgsrc-2007Q1-base:1.5
	pkgsrc-2006Q4:1.4.0.14
	pkgsrc-2006Q4-base:1.4
	pkgsrc-2006Q3:1.4.0.12
	pkgsrc-2006Q3-base:1.4
	pkgsrc-2006Q2:1.4.0.10
	pkgsrc-2006Q2-base:1.4
	pkgsrc-2006Q1:1.4.0.8
	pkgsrc-2006Q1-base:1.4
	pkgsrc-2005Q4:1.4.0.6
	pkgsrc-2005Q4-base:1.4
	pkgsrc-2005Q3:1.4.0.4
	pkgsrc-2005Q3-base:1.4
	pkgsrc-2005Q2:1.4.0.2
	pkgsrc-2005Q2-base:1.4
	pkgsrc-2005Q1:1.2.0.6
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.4
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.2
	pkgsrc-2004Q3-base:1.2;
locks; strict;
comment	@# @;


1.8
date	2009.10.18.22.22.10;	author ahoka;	state dead;
branches;
next	1.7;

1.7
date	2008.02.05.17.00.36;	author drochner;	state Exp;
branches;
next	1.6;

1.6
date	2007.12.21.11.31.22;	author tron;	state dead;
branches
	1.6.2.1;
next	1.5;

1.5
date	2007.01.09.14.49.33;	author drochner;	state Exp;
branches;
next	1.4;

1.4
date	2005.04.18.17.49.41;	author drochner;	state dead;
branches
	1.4.14.1;
next	1.3;

1.3
date	2005.04.16.17.43.09;	author drochner;	state Exp;
branches;
next	1.2;

1.2
date	2004.07.17.19.06.36;	author wiz;	state dead;
branches
	1.2.6.1;
next	1.1;

1.1
date	2004.07.02.17.07.21;	author drochner;	state Exp;
branches;
next	;

1.6.2.1
date	2008.02.11.12.04.15;	author ghen;	state Exp;
branches;
next	;

1.4.14.1
date	2007.01.28.20.37.59;	author ghen;	state Exp;
branches;
next	;

1.2.6.1
date	2005.04.21.15.20.40;	author salo;	state Exp;
branches;
next	;


desc
@@


1.8
log
@Upgrade to the SVN snapshot as of 2009-10-17.
The builtin libavcodec now uses yasm to assemble hand written
h264 code. The older x264 we currently have in pkgsrc is not supported
by mplayer, so I had to do some hand tweaking to make it work.
It may contain bugs because of this, so report any fallouts with h264.
@
text
@$NetBSD: patch-bb,v 1.7 2008/02/05 17:00:36 drochner Exp $

--- libmpdemux/demux_mov.c.orig	2007-10-07 21:49:33.000000000 +0200
+++ libmpdemux/demux_mov.c
@@@@ -173,11 +173,12 @@@@ void mov_build_index(mov_track_t* trak,i
     i=trak->chunkmap_size;
     while(i>0){
 	--i;
-	for(j=trak->chunkmap[i].first;j<last;j++){
+	j=FFMAX(trak->chunkmap[i].first, 0);
+	for(;j<last;j++){
 	    trak->chunks[j].desc=trak->chunkmap[i].sdid;
 	    trak->chunks[j].size=trak->chunkmap[i].spc;
 	}
-	last=trak->chunkmap[i].first;
+	last=FFMIN(trak->chunkmap[i].first, trak->chunks_size);
     }
 
 #if 0
@@@@ -235,6 +236,8 @@@@ void mov_build_index(mov_track_t* trak,i
     s=0;
     for(j=0;j<trak->durmap_size;j++){
 	for(i=0;i<trak->durmap[j].num;i++){
+	    if (s >= trak->samples_size)
+		break;
 	    trak->samples[s].pts=pts;
 	    ++s;
 	    pts+=trak->durmap[j].dur;
@@@@ -246,6 +249,8 @@@@ void mov_build_index(mov_track_t* trak,i
     for(j=0;j<trak->chunks_size;j++){
 	off_t pos=trak->chunks[j].pos;
 	for(i=0;i<trak->chunks[j].size;i++){
+	    if (s >= trak->samples_size)
+		break;
 	    trak->samples[s].pos=pos;
 	    mp_msg(MSGT_DEMUX, MSGL_DBG3, "Sample %5d: pts=%8d  off=0x%08X  size=%d\n",s,
 		trak->samples[s].pts,
@@@@ -1568,8 +1573,7 @@@@ static void lschunks(demuxer_t* demuxer,
 			if( udta_len>udta_size)
 				udta_len=udta_size;
 			{
-			char dump[udta_len-4];
-			stream_read(demuxer->stream, (char *)&dump, udta_len-4-4);
+			stream_skip(demuxer->stream, udta_len-4-4);
 			udta_size -= udta_len;
 			}
 		    }
@


1.7
log
@add some patches from upstream which fix CVE-2008-0485, CVE-2008-0486
and two unnamed buffer overflows, bump PKGREVISION of affected pkgs
@
text
@d1 1
a1 1
$NetBSD$
@


1.6
log
@Update "mplayer", "mplayer-share", "mencoder"  and "gmplayer" packages
to version 1.0rc2 (as 1.0rc10).
Changes since version 1.0rc1 (known as 1.0rc9 in "pkgsrc"):
- A lot of new audio and video decoders and other improvements
- A large number of bug fixes
- Updated documentation
- Support for Mac OS X Intel

Approved by Thomas Klausner (because it fixes the Darwin-i386 build).
@
text
@d1 1
a1 1
$NetBSD: patch-bb,v 1.5 2007/01/09 14:49:33 drochner Exp $
d3 15
a17 8
--- stream/realrtsp/real.c.orig	2006-10-23 00:32:25.000000000 +0200
+++ stream/realrtsp/real.c
@@@@ -271,7 +271,7 @@@@ static rmff_header_t *real_parse_sdp(cha
     int j=0;
     int n;
     char b[64];
-    int rulematches[16];
+    int rulematches[MAX_RULEMATCHES];
d19 29
a47 2
 #ifdef LOG
     printf("calling asmrp_match with:\n%s\n%u\n", desc->stream[i]->asm_rule_book, bandwidth);
@


1.6.2.1
log
@Pullup ticket 2287 - requested by drochner
security fixes for mplayer and mencoder

- pkgsrc/multimedia/gmplayer/Makefile			1.67
- pkgsrc/multimedia/mencoder/Makefile			1.37
- pkgsrc/multimedia/mplayer/Makefile			1.52
- pkgsrc/multimedia/mplayer-share/distinfo		1.47
- pkgsrc/multimedia/mplayer-share/patches/patch-ba	1.7
- pkgsrc/multimedia/mplayer-share/patches/patch-bb	1.7
- pkgsrc/multimedia/mplayer-share/patches/patch-bc	1.5
- pkgsrc/multimedia/mplayer-share/patches/patch-bd	1.5

   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Tue Feb  5 17:00:37 UTC 2008

   Modified Files:
           pkgsrc/multimedia/gmplayer: Makefile
           pkgsrc/multimedia/mencoder: Makefile
           pkgsrc/multimedia/mplayer: Makefile
           pkgsrc/multimedia/mplayer-share: distinfo
   Added Files:
           pkgsrc/multimedia/mplayer-share/patches: patch-ba patch-bb patch-bc
               patch-bd

   Log Message:
   add some patches from upstream which fix CVE-2008-0485, CVE-2008-0486
   and two unnamed buffer overflows, bump PKGREVISION of affected pkgs
@
text
@d1 1
a1 1
$NetBSD$
d3 8
a10 15
--- libmpdemux/demux_mov.c.orig	2007-10-07 21:49:33.000000000 +0200
+++ libmpdemux/demux_mov.c
@@@@ -173,11 +173,12 @@@@ void mov_build_index(mov_track_t* trak,i
     i=trak->chunkmap_size;
     while(i>0){
 	--i;
-	for(j=trak->chunkmap[i].first;j<last;j++){
+	j=FFMAX(trak->chunkmap[i].first, 0);
+	for(;j<last;j++){
 	    trak->chunks[j].desc=trak->chunkmap[i].sdid;
 	    trak->chunks[j].size=trak->chunkmap[i].spc;
 	}
-	last=trak->chunkmap[i].first;
+	last=FFMIN(trak->chunkmap[i].first, trak->chunks_size);
     }
d12 2
a13 29
 #if 0
@@@@ -235,6 +236,8 @@@@ void mov_build_index(mov_track_t* trak,i
     s=0;
     for(j=0;j<trak->durmap_size;j++){
 	for(i=0;i<trak->durmap[j].num;i++){
+	    if (s >= trak->samples_size)
+		break;
 	    trak->samples[s].pts=pts;
 	    ++s;
 	    pts+=trak->durmap[j].dur;
@@@@ -246,6 +249,8 @@@@ void mov_build_index(mov_track_t* trak,i
     for(j=0;j<trak->chunks_size;j++){
 	off_t pos=trak->chunks[j].pos;
 	for(i=0;i<trak->chunks[j].size;i++){
+	    if (s >= trak->samples_size)
+		break;
 	    trak->samples[s].pos=pos;
 	    mp_msg(MSGT_DEMUX, MSGL_DBG3, "Sample %5d: pts=%8d  off=0x%08X  size=%d\n",s,
 		trak->samples[s].pts,
@@@@ -1568,8 +1573,7 @@@@ static void lschunks(demuxer_t* demuxer,
 			if( udta_len>udta_size)
 				udta_len=udta_size;
 			{
-			char dump[udta_len-4];
-			stream_read(demuxer->stream, (char *)&dump, udta_len-4-4);
+			stream_skip(demuxer->stream, udta_len-4-4);
 			udta_size -= udta_len;
 			}
 		    }
@


1.5
log
@add limit check to real parser (identical to CVE-2006-6172)
from mplayer svn

bump PKGREVISIONs
@
text
@d1 1
a1 1
$NetBSD$
@


1.4
log
@update to 1.0pre7
some relevant changes:
-RTSP/MMST security patches now in main distribution
-documentation improvements
-x86_64 support fixes
-integrated Tremor decoder for Ogg/Vorbis
-expose support for 422P and 444P raw formats
-dropped support of old FAAD2 versions (<= 1.1)
-support for 32 bit float and extended WAV files
-support for multichannel WAV files
-ALAC (QuickTime lossless audio) support via lavc
-vqf demuxer
-support for Real multirate files
-more user-friendly info about audio and subtitle tracks in Ogg files
-streaming improvements
-ffmpeg updates
-MEncoder usability improvements
-many fixes and cleanups
@
text
@d1 1
a1 1
$NetBSD: patch-bb,v 1.3 2005/04/16 17:43:09 drochner Exp $
d3 8
a10 3
--- libmpdemux/asf_mmst_streaming.c.orig	2005-04-16 21:10:36.000000000 +0200
+++ libmpdemux/asf_mmst_streaming.c
@@@@ -334,8 +334,12 @@@@ static int interp_header (uint8_t *heade
d12 2
a13 11
       printf ("stream object, stream id: %d\n", stream_id);
 
+      if (num_stream_ids < 20) {
       stream_ids[num_stream_ids] = stream_id;
       num_stream_ids++;
+      } else {
+	printf ("too many id, stream skipped");
+      }
       
     } else {
       printf ("unknown object\n");
@


1.4.14.1
log
@Pullup ticket 1986 - requested by drochner
security fix for mplayer, gmplayer, mencoder
(I forgot to commit multimedia/mplayer-share/patches/patch-* the first time)

- pkgsrc/multimedia/gmplayer/Makefile			1.58
- pkgsrc/multimedia/gmplayer/distinfo			1.44
- pkgsrc/multimedia/mencoder/Makefile			1.31
- pkgsrc/multimedia/mplayer/Makefile			1.38
- pkgsrc/multimedia/mplayer-share/distinfo		1.36
- pkgsrc/multimedia/mplayer-share/patches/patch-ba	1.5
- pkgsrc/multimedia/mplayer-share/patches/patch-bb	1.5
- pkgsrc/multimedia/mplayer-share/patches/patch-bc	1.3

   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Tue Jan  9 14:49:34 UTC 2007

   Modified Files:
        pkgsrc/multimedia/gmplayer: Makefile distinfo
        pkgsrc/multimedia/mencoder: Makefile
        pkgsrc/multimedia/mplayer: Makefile
        pkgsrc/multimedia/mplayer-share: distinfo
   Added Files:
        pkgsrc/multimedia/mplayer-share/patches: patch-ba patch-bb patch-bc

   Log Message:
   add limit check to real parser (identical to CVE-2006-6172)
   from mplayer svn

   bump PKGREVISIONs
@
text
@d1 1
a1 1
$NetBSD$
d3 3
a5 8
--- stream/realrtsp/real.c.orig	2006-10-23 00:32:25.000000000 +0200
+++ stream/realrtsp/real.c
@@@@ -271,7 +271,7 @@@@ static rmff_header_t *real_parse_sdp(cha
     int j=0;
     int n;
     char b[64];
-    int rulematches[16];
+    int rulematches[MAX_RULEMATCHES];
d7 11
a17 2
 #ifdef LOG
     printf("calling asmrp_match with:\n%s\n%u\n", desc->stream[i]->asm_rule_book, bandwidth);
@


1.3
log
@two security patches: Real RTSP heap overflow, MMST heap overflow
(both patches published on the mplayer website)
bump PKGREVISION of affected pkgs
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@Update to 1.0pre5:
DOCS

    * small additions, corrections, updates all over the place
    * audio output driver section added to the man page
    * several bug fixes and improvements in the MEncoder documentation
    * DVD ripping guide extended and improved
    * AUTHORS file massively extended
    * German man page partially updated
    * Hungarian XML documentation translation started

Ports

    * encrypted DVD playback on Windows fixed (again)
    * Cygwin and MinGW now accept the same -dvd-device syntax
    * LIVE.COM now works under MinGW
    * foundations for MinGW crosscompilation
    * disabled SSE on MinGW as it caused crashes
    * AC3 passthrough for ao_win32
    * improved vo_quartz (YUV, multiple screens support)
    * vo_quartz made default on Mac OS X
    * ao_macosx fixed and made default again on Mac OS X
    * RealVideo binary codecs support on Mac OS X (still buggy)
    * bigendian fixes in vf.c, vo_tga
    * OpenBSD portability fixes
    * OpenBSD/VAX support
    * AMD64 support

Drivers

    * support for more Radeons (9800 XT among them) in VIDIX
    * Radeon related bug fixes in VIDIX
    * vo_gl2 now supports GUI, fix for flickering borders in fullscreen
    * support 24 and 32 bit PCM files, bigendian fixes
    * ao_sdl now converts unsupported formats instead of quitting
    * ENCA support
    * merged ao_alsa9 and ao_alsa1x drivers into ao_alsa
    * NeoMagic TV-out support through VESA
    * JACK audio output driver
    * vo_sdl fixes (wrong flags and screensaver disabling)
    * vo_directx fixes

Decoders

    * MSZH/ZLIB, FLI, QTRLE, RoQ video and RoQ audio support moved to FFmpeg
    * FFmpeg Cinepak and CYUV decoders preferred
    * audio format 0xff support (is AAC)
    * "raw" audio in MOV supported
    * Indeo audio (iac25) support via binary codec
    * upgrade libfaad2 to the FAAD 2.0 release
    * MPEG2 chroma422/444 support
    * Winnov WINX and WNV1 support via binary codec

Demuxers

    * Ogg subtitle handling and other bug fixes
    * Matroska improvements
    * support seeking in Real files without -idx
    * support seeking in Real files without index with -forceidx

Streaming

    * ASF, MMST streaming fixes
    * URL escaping fixed
    * NSA (Nullsoft audio) streaming support
    * embedded RAM playlist support
    * multibyte URL support
    * rtp:// now supported even with LIVE.COM compiled in
    * miscellaneous bug fixes

Filters

    * vf_softskip: frame skipping filter for MEncoder
    * vf_harddup: frame duplication filter for MEncoder
    * vf_pullup minor fixes and improvements
    * AltiVec-optimized YUV to RGB converter
    * vf_spp memory corruption fix on reallocation

FFmpeg/libavcodec

    * MPEG2 encoding with 8, 9, 10, 11 bit intra DC precision
    * DC clipping fix, intra_dc_precision > 0 support
    * Cinepak fixes and palette support
    * support skipping of MB rows during decoding
    * Vorbis in NUT fixed
    * NUT updated to latest specification
    * segfault and artifact fixes in SVQ3 decoder
    * motion estimation code: overflow and chroma fixes
    * change qscale -> lambda for the motion estimation
    * noise preserving sum of squares comparison function in ME code
    * fixed memory overwrite in truemotion decoder
    * clip input motion vectors, better error tolerance on bad vectors
    * FLAC decoder cleanup (partial demuxer/decoder separation)
    * memalign hack for SSE/SSE2 on that alternative OS :)
    * lots of AltiVec optimizations
    * qscale + qprd fix
    * QTrle4 support
    * H.261 decoder
    * coefficient saturation fix in H.263
    * H.263 MCBPC fix
    * per line lowpass filter in MMX and faster C lowpass filter
    * SVQ1 encoder
    * as usual, lots of bug fixes and optimizations

Others

    * fullscreen fixes for many window managers
    * fix crash on original Pentiums and older
    * dvd://start-end support
    * netstream (mpst://) support fixed
    * support comments in plaintext playlists
    * loader/ dependency removed
    * keepaspect option extended to all video output drivers
    * WMA to Ogg conversion and simple subtitle editing script added to TOOLS
    * support for more lame options
    * new set of GUI icons
    * memory conserving implementation of GUI potmeters
    * X11 code reindented
    * further gcc 3.4 support fixes
    * mixer API written for changing volume through libaf
    * -rtc-device option for specifying the RTC device
    * desktop/menu icon added
    * miscellaneous bug fixes and cleanups
    * multi-threaded encoding with lavc
    * fixed a bug with Real files introduced in pre4
    * -use-stdin renamed to -noconsolecontrols
@
text
@d1 1
a1 1
$NetBSD: patch-bb,v 1.1 2004/07/02 17:07:21 drochner Exp $
d3 3
a5 3
--- Gui/mplayer/common.c.orig	2003-03-20 13:42:09.000000000 +0100
+++ Gui/mplayer/common.c
@@@@ -32,35 +32,39 @@@@
d7 1
a7 1
 extern unsigned int GetTimerMS( void );
d9 9
a17 173
-inline void TranslateFilename( int c,char * tmp )
+inline void TranslateFilename( int c,char * tmp,size_t tmplen )
 {
  int i;
+ char * p;
+ 
  switch ( guiIntfStruct.StreamType )
   {
    case STREAMTYPE_STREAM:
-        strcpy( tmp,guiIntfStruct.Filename );
+        strlcpy(tmp, guiIntfStruct.Filename, tmplen);
         break;
    case STREAMTYPE_FILE:
           if ( ( guiIntfStruct.Filename )&&( guiIntfStruct.Filename[0] ) )
            {
-	    if ( strrchr( guiIntfStruct.Filename,'/' ) ) strcpy( tmp,strrchr( guiIntfStruct.Filename,'/' ) + 1 );
-	     else strcpy( tmp,guiIntfStruct.Filename );
+            if ( p = strrchr(guiIntfStruct.Filename, '/') )
+              strlcpy(tmp, p + 1, tmplen);
+            else
+              strlcpy(tmp, guiIntfStruct.Filename, tmplen);
             if ( tmp[strlen( tmp ) - 4] == '.' ) tmp[strlen( tmp ) - 4]=0;
             if ( tmp[strlen( tmp ) - 5] == '.' ) tmp[strlen( tmp ) - 5]=0;
-           } else strcpy( tmp,MSGTR_NoFileLoaded );
+           } else strlcpy( tmp,MSGTR_NoFileLoaded,tmplen );
           break;
 #ifdef USE_DVDREAD
    case STREAMTYPE_DVD:
-          if ( guiIntfStruct.DVD.current_chapter ) sprintf( tmp,MSGTR_Chapter,guiIntfStruct.DVD.current_chapter );
-            else strcat( tmp,MSGTR_NoChapter );
+          if ( guiIntfStruct.DVD.current_chapter ) snprintf(tmp,tmplen,MSGTR_Chapter,guiIntfStruct.DVD.current_chapter );
+            else strlcat( tmp,MSGTR_NoChapter,tmplen );
           break;
 #endif
 #ifdef HAVE_VCD
    case STREAMTYPE_VCD:
-        sprintf( tmp,MSGTR_VCDTrack,guiIntfStruct.Track );
+        snprintf( tmp,tmplen,MSGTR_VCDTrack,guiIntfStruct.Track );
 	break;
 #endif
-   default: strcpy( tmp,MSGTR_NoMediaOpened );
+   default: strlcpy( tmp,MSGTR_NoMediaOpened,tmplen );
   }
  if ( c )
   {
@@@@ -74,75 +78,94 @@@@ inline void TranslateFilename( int c,cha
   }
 }
 
+/* Unsafe!  Pass only null-terminated strings as (char *)str. */
 char * Translate( char * str )
 {
  static char   trbuf[512];
         char   tmp[512];
         int    i,c;
         int    t;
+        int    strsize = 0;
  memset( trbuf,0,512 );
  memset( tmp,0,128 );
- for ( c=0,i=0;i < (int)strlen( str );i++ )
+ strsize = strlen(str);
+ for ( c=0,i=0;i < strsize;i++ )
   {
    if ( str[i] != '$' ) { trbuf[c++]=str[i]; trbuf[c]=0; }
     else
     {
      switch ( str[++i] )
       {
-       case 't': sprintf( tmp,"%02d",guiIntfStruct.Track ); strcat( trbuf,tmp ); break;
-       case 'o': TranslateFilename( 0,tmp ); strcat( trbuf,tmp ); break;
-       case 'f': TranslateFilename( 1,tmp ); strcat( trbuf,tmp ); break;
-       case 'F': TranslateFilename( 2,tmp ); strcat( trbuf,tmp ); break;
+       case 't': snprintf( tmp,sizeof( tmp ),"%02d",guiIntfStruct.Track );
+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
+       case 'o': TranslateFilename( 0,tmp,sizeof( tmp ) );
+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
+       case 'f': TranslateFilename( 1,tmp,sizeof( tmp ) );
+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
+       case 'F': TranslateFilename( 2,tmp,sizeof( tmp ) );
+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
        case '6': t=guiIntfStruct.LengthInSec; goto calclengthhhmmss;
        case '1': t=guiIntfStruct.TimeSec;
 calclengthhhmmss:
-            sprintf( tmp,"%02d:%02d:%02d",t/3600,t/60%60,t%60 ); strcat( trbuf,tmp );
+            snprintf( tmp,sizeof( tmp ),"%02d:%02d:%02d",t/3600,t/60%60,t%60 );
+            strlcat( trbuf,tmp,sizeof( trbuf ) );
             break;
        case '7': t=guiIntfStruct.LengthInSec; goto calclengthmmmmss;
        case '2': t=guiIntfStruct.TimeSec;
 calclengthmmmmss:
-            sprintf( tmp,"%04d:%02d",t/60,t%60 ); strcat( trbuf,tmp );
+            snprintf( tmp,sizeof( tmp ),"%04d:%02d",t/60,t%60 );
+            strlcat( trbuf,tmp,sizeof( trbuf ) );
             break;
-       case '3': sprintf( tmp,"%02d",guiIntfStruct.TimeSec / 3600 ); strcat( trbuf,tmp ); break;
-       case '4': sprintf( tmp,"%02d",( ( guiIntfStruct.TimeSec / 60 ) % 60 ) ); strcat( trbuf,tmp ); break;
-       case '5': sprintf( tmp,"%02d",guiIntfStruct.TimeSec % 60 ); strcat( trbuf,tmp ); break;
-       case '8': sprintf( tmp,"%01d:%02d:%02d",guiIntfStruct.TimeSec / 3600,( guiIntfStruct.TimeSec / 60 ) % 60,guiIntfStruct.TimeSec % 60 ); strcat( trbuf,tmp ); break;
-       case 'v': sprintf( tmp,"%3.2f%%",guiIntfStruct.Volume ); strcat( trbuf,tmp ); break;
-       case 'V': sprintf( tmp,"%3.1f",guiIntfStruct.Volume ); strcat( trbuf,tmp ); break;
-       case 'b': sprintf( tmp,"%3.2f%%",guiIntfStruct.Balance ); strcat( trbuf,tmp ); break;
-       case 'B': sprintf( tmp,"%3.1f",guiIntfStruct.Balance ); strcat( trbuf,tmp ); break;
-       case 'd': sprintf( tmp,"%d",guiIntfStruct.FrameDrop ); strcat( trbuf,tmp ); break;
-       case 'x': sprintf( tmp,"%d",guiIntfStruct.MovieWidth ); strcat( trbuf,tmp ); break;
-       case 'y': sprintf( tmp,"%d",guiIntfStruct.MovieHeight ); strcat( trbuf,tmp ); break;
-       case 'C': sprintf( tmp,"%s", guiIntfStruct.sh_video? ((sh_video_t *)guiIntfStruct.sh_video)->codec->name : "");
-                 strcat( trbuf,tmp ); break;
-       case 's': if ( guiIntfStruct.Playing == 0 ) strcat( trbuf,"s" ); break;
-       case 'l': if ( guiIntfStruct.Playing == 1 ) strcat( trbuf,"p" ); break;
-       case 'e': if ( guiIntfStruct.Playing == 2 ) strcat( trbuf,"e" ); break;
+       case '3': snprintf( tmp,sizeof( tmp ),"%02d",guiIntfStruct.TimeSec / 3600 );
+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
+       case '4': snprintf( tmp,sizeof( tmp ),"%02d",( ( guiIntfStruct.TimeSec / 60 ) % 60 ) );
+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
+       case '5': snprintf( tmp,sizeof( tmp ),"%02d",guiIntfStruct.TimeSec % 60 );
+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
+       case '8': snprintf( tmp,sizeof( tmp ),"%01d:%02d:%02d",guiIntfStruct.TimeSec / 3600,( guiIntfStruct.TimeSec / 60 ) % 60,guiIntfStruct.TimeSec % 60 ); strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
+       case 'v': snprintf( tmp,sizeof( tmp ),"%3.2f%%",guiIntfStruct.Volume );
+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
+       case 'V': snprintf( tmp,sizeof( tmp ),"%3.1f",guiIntfStruct.Volume );
+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
+       case 'b': snprintf( tmp,sizeof( tmp ),"%3.2f%%",guiIntfStruct.Balance );
+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
+       case 'B': snprintf( tmp,sizeof( tmp ),"%3.1f",guiIntfStruct.Balance );
+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
+       case 'd': snprintf( tmp,sizeof( tmp ),"%d",guiIntfStruct.FrameDrop );
+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
+       case 'x': snprintf( tmp,sizeof( tmp ),"%d",guiIntfStruct.MovieWidth );
+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
+       case 'y': snprintf( tmp,sizeof( tmp ),"%d",guiIntfStruct.MovieHeight );
+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
+       case 'C': snprintf( tmp,sizeof( tmp ),"%s", guiIntfStruct.sh_video? ((sh_video_t *)guiIntfStruct.sh_video)->codec->name : "");
+                 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
+       case 's': if ( guiIntfStruct.Playing == 0 ) strlcat( trbuf,"s",sizeof( trbuf ) ); break;
+       case 'l': if ( guiIntfStruct.Playing == 1 ) strlcat( trbuf,"p",sizeof( trbuf ) ); break;
+       case 'e': if ( guiIntfStruct.Playing == 2 ) strlcat( trbuf,"e",sizeof( trbuf ) ); break;
        case 'a':
-            if ( muted ) { strcat( trbuf,"n" ); break; }
+            if ( muted ) { strlcat( trbuf,"n",sizeof( trbuf ) ); break; }
             switch ( guiIntfStruct.AudioType )
              {
-              case 0: strcat( trbuf,"n" ); break;
-              case 1: strcat( trbuf,"m" ); break;
-              case 2: strcat( trbuf,"t" ); break;
+              case 0: strlcat( trbuf,"n",sizeof( trbuf ) ); break;
+              case 1: strlcat( trbuf,"m",sizeof( trbuf ) ); break;
+              case 2: strlcat( trbuf,"t",sizeof( trbuf ) ); break;
              }
             break;
        case 'T':
            switch ( guiIntfStruct.StreamType )
             {
-             case STREAMTYPE_FILE:   strcat( trbuf,"f" ); break;
+             case STREAMTYPE_FILE:   strlcat( trbuf,"f",sizeof( trbuf ) ); break;
 #ifdef HAVE_VCD
-             case STREAMTYPE_VCD:    strcat( trbuf,"v" ); break;
+             case STREAMTYPE_VCD:    strlcat( trbuf,"v",sizeof( trbuf ) ); break;
 #endif
-             case STREAMTYPE_STREAM: strcat( trbuf,"u" ); break;
+             case STREAMTYPE_STREAM: strlcat( trbuf,"u",sizeof( trbuf ) ); break;
 #ifdef USE_DVDREAD
-             case STREAMTYPE_DVD:    strcat( trbuf,"d" ); break;
+             case STREAMTYPE_DVD:    strlcat( trbuf,"d",sizeof( trbuf ) ); break;
 #endif
-             default:                strcat( trbuf," " ); break;
+             default:                strlcat( trbuf," ",sizeof( trbuf ) ); break;
             }
            break;
-       case '$': strcat( trbuf,"$" ); break;
+       case '$': strlcat( trbuf,"$",sizeof( trbuf ) ); break;
        default: continue;
       }
      c=strlen( trbuf );
@


1.2.6.1
log
@Pullup ticket 451 - requested by Matthias Drochner
security fix for mplayer

Revisions pulled up:
- pkgsrc/multimedia/gmplayer/Makefile			1.30, 1.32
- pkgsrc/multimedia/gmplayer/distinfo			1.24-1.25
- pkgsrc/multimedia/mencoder/Makefile			1.18
- pkgsrc/multimedia/mplayer/Makefile			1.16
- pkgsrc/multimedia/mplayer-share/distinfo		1.18
- pkgsrc/multimedia/mplayer-share/patches/patch-ba	1.3
- pkgsrc/multimedia/mplayer-share/patches/patch-bb	1.3

   Module Name:		pkgsrc
   Committed By:	abs
   Date:		Sat Apr  9 11:19:32 UTC 2005

   Modified Files:
   	pkgsrc/multimedia/gmplayer: Makefile distinfo

   Log Message:
   Update gmplayer to 1.0rc6nb2:
       Change DIST_SUBDIR - skins have been updated on master site again
---
   Module Name:		pkgsrc
   Committed By:	drochner
   Date:		Sat Apr 16 17:43:09 UTC 2005

   Modified Files:
   	pkgsrc/multimedia/gmplayer: Makefile distinfo
   	pkgsrc/multimedia/mencoder: Makefile
   	pkgsrc/multimedia/mplayer: Makefile
   	pkgsrc/multimedia/mplayer-share: distinfo
   Added Files:
   	pkgsrc/multimedia/mplayer-share/patches: patch-ba patch-bb

   Log Message:
   two security patches: Real RTSP heap overflow, MMST heap overflow
   (both patches published on the mplayer website)
   bump PKGREVISION of affected pkgs
@
text
@d1 1
a1 1
$NetBSD: patch-bb,v 1.3 2005/04/16 17:43:09 drochner Exp $
d3 3
a5 3
--- libmpdemux/asf_mmst_streaming.c.orig	2005-04-16 21:10:36.000000000 +0200
+++ libmpdemux/asf_mmst_streaming.c
@@@@ -334,8 +334,12 @@@@ static int interp_header (uint8_t *heade
d7 1
a7 1
       printf ("stream object, stream id: %d\n", stream_id);
d9 173
a181 9
+      if (num_stream_ids < 20) {
       stream_ids[num_stream_ids] = stream_id;
       num_stream_ids++;
+      } else {
+	printf ("too many id, stream skipped");
+      }
       
     } else {
       printf ("unknown object\n");
@


1.1
log
@apply the patch from the mplayer site to fix buffer overflow
vulnerabilities in the GUI
@
text
@d1 1
a1 1
$NetBSD$
@