daftaupe/opt
1
0
Fork 0
forked from ports/opt
Code Pull Requests Activity

[security] mplayer: patched for ASF demuxer heap overflow (see http://www.mplayerhq.hu/design7/news.html or CAN-2006-0579), thanks maro; win32codecs separated, see http://crux.nu/cgi-bin/trac.cgi/changeset/843

Browse Source
This commit is contained in:
Matt Housh 2006-02-26 06:19:48 +00:00
parent dfbd3fa5f3
commit 32c8623f47
4 changed files with 52 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
mplayer/.footprint
View File

@ -28,74 +28,6 @@ lrwxrwxrwx root/root usr/man/man1/mencoder.1.gz -> mplayer.1.gz
-rw-r--r-- root/root usr/man/man1/mplayer.1.gz
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/mplayer/
drwxr-xr-x root/root usr/share/mplayer/codecs/
-rw-r--r-- root/root usr/share/mplayer/codecs/AvidQTAVUICodec.qtx
-rw-r--r-- root/root usr/share/mplayer/codecs/BeHereiVideo.qtx
-rw-r--r-- root/root usr/share/mplayer/codecs/CLRVIDDC.DLL
-rw-r--r-- root/root usr/share/mplayer/codecs/CtWbJpg.DLL
-rw-r--r-- root/root usr/share/mplayer/codecs/DECVW_32.DLL
-rw-r--r-- root/root usr/share/mplayer/codecs/LCMW2.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/LCODCCMW2E.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/QuickTime.qts
-rw-r--r-- root/root usr/share/mplayer/codecs/QuickTimeEssentials.qtx
-rw-r--r-- root/root usr/share/mplayer/codecs/QuickTimeInternetExtras.qtx
-rw-r--r-- root/root usr/share/mplayer/codecs/VDODEC32.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/ViVD2.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/acelpdec.ax
-rw-r--r-- root/root usr/share/mplayer/codecs/alf2cd.acm
-rw-r--r-- root/root usr/share/mplayer/codecs/aslcodec_dshow.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/atrac3.acm
-rw-r--r-- root/root usr/share/mplayer/codecs/atrc.so.6.0
-rw-r--r-- root/root usr/share/mplayer/codecs/clrviddd.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/cook.so
-rw-r--r-- root/root usr/share/mplayer/codecs/drvc.so
-rw-r--r-- root/root usr/share/mplayer/codecs/dspr.so.6.0
-rw-r--r-- root/root usr/share/mplayer/codecs/iac25_32.ax
-rw-r--r-- root/root usr/share/mplayer/codecs/icmw_32.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/imc32.acm
-rw-r--r-- root/root usr/share/mplayer/codecs/ir41_32.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/ir50_32.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/ivvideo.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/jp2avi.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/lhacm.acm
-rw-r--r-- root/root usr/share/mplayer/codecs/lsvxdec.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/m3jp2k32.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/mi-sc4.acm
-rw-r--r-- root/root usr/share/mplayer/codecs/msh261.drv
-rw-r--r-- root/root usr/share/mplayer/codecs/msms001.vwp
-rw-r--r-- root/root usr/share/mplayer/codecs/msscds32.ax
-rw-r--r-- root/root usr/share/mplayer/codecs/nsrt2432.acm
-rw-r--r-- root/root usr/share/mplayer/codecs/qpeg32.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/qtmlClient.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/rt32dcmp.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/sipr.so.6.0
-rw-r--r-- root/root usr/share/mplayer/codecs/tm20dec.ax
-rw-r--r-- root/root usr/share/mplayer/codecs/tokf.so.6.0
-rw-r--r-- root/root usr/share/mplayer/codecs/tokr.so.6.0
-rw-r--r-- root/root usr/share/mplayer/codecs/tsd32.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/tssoft32.acm
-rw-r--r-- root/root usr/share/mplayer/codecs/tvqdec.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/vdowave.drv
-rw-r--r-- root/root usr/share/mplayer/codecs/vid_3ivX.xa
-rw-r--r-- root/root usr/share/mplayer/codecs/vivog723.acm
-rw-r--r-- root/root usr/share/mplayer/codecs/vmnc.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/voxmsdec.ax
-rw-r--r-- root/root usr/share/mplayer/codecs/vp4vfw.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/vp5vfw.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/vp6vfw.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/vssh264.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/vssh264core.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/vssh264dec.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/vsslight.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/vsswlt.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/wma9dmod.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/wmadmod.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/wmsdmod.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/wmspdmod.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/wmv9dmod.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/wmvadvd.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/wmvdmod.dll
-rw-r--r-- root/root usr/share/mplayer/codecs/wnvwinx.dll
drwxr-xr-x root/root usr/share/mplayer/font/
drwxr-xr-x root/root usr/share/mplayer/font/font-arial-14-iso-8859-1/
-rw-r--r-- root/root usr/share/mplayer/font/font-arial-14-iso-8859-1/font.desc

2
mplayer/.md5sum
View File

@ -1,4 +1,4 @@
aaca4fd327176c1afb463f0f047ef6f4 MPlayer-1.0pre7try2.tar.bz2
5fe89bb095bdf9b4f9cda5479dbde906 essential-20050412.tar.bz2
ad36895346d36b51005c9f0d0c78effe demuxer_h_fix_20060212.diff
1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2
c64631601912913f3e5dfbecc3b79d44 mplayer.conf

21
mplayer/Pkgfile
View File

@ -1,32 +1,33 @@
# Description: Media player with many codecs
# Description: Versatile media player and encoder/converter
# URL: http://www.mplayerhq.hu/
# Maintainer: Matt Housh, jaeger at morpheus dot net
# Depends on: x11
# Nice to have: libsdl, libjpeg, libpng, lame, zlib, libogg, libvorbis, \
# cdparanoia
# cdparanoia, win32-essential-codecs
# More information can be found at http://www.mplayerhq.hu/DOCS/codecs.html and
# http://www.mplayerhq.hu/DOCS/HTML/en/index.html
name=mplayer
version=1.0pre7try2
release=1
release=2
source=(http://mirrors.xmission.com/mplayer/releases/MPlayer-$version.tar.bz2 \
http://mirrors.xmission.com/mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 \
http://mirrors.xmission.com/mplayer/releases/codecs/essential-20050412.tar.bz2 \
mplayer.conf)
mplayer.conf demuxer_h_fix_20060212.diff)
build() {
cd MPlayer-$version
# ASF demuxer security patch (CAN-2006-0579)
patch -p0 -i $SRC/demuxer_h_fix_20060212.diff
# mplayer decides optimizations at configure time, don't use CRUX's
unset CFLAGS
./configure --prefix=/usr \
--enable-linux-devfs \
--disable-divx4linux \
--with-win32libdir=/usr/share/mplayer/codecs \
--with-reallibdir=/usr/share/mplayer/codecs
--with-codecsdir=/usr/lib/win32
make
make DESTDIR=$PKG install
@ -43,12 +44,6 @@ build() {
done)
chmod 644 $PKG/usr/share/mplayer/font/font-arial-??-iso-8859-1/*
# codecs
mkdir -p $PKG/usr/share/mplayer/codecs
cp $SRC/essential-20050412/* $PKG/usr/share/mplayer/codecs
chmod 644 $PKG/usr/share/mplayer/codecs/*
rm $PKG/usr/share/mplayer/codecs/README
# config
cp $SRC/mplayer.conf $PKG/usr/etc/mplayer/
cp etc/input.conf $PKG/usr/etc/mplayer/

43
mplayer/demuxer_h_fix_20060212.diff Normal file
View File

@ -0,0 +1,43 @@
Index: libmpdemux/demuxer.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.h,v
retrieving revision 1.87
retrieving revision 1.90
diff -u -r1.87 -r1.90
--- libmpdemux/demuxer.h 9 Feb 2006 19:39:51 -0000 1.87
+++ libmpdemux/demuxer.h 12 Feb 2006 17:01:30 -0000 1.90
@@ -190,17 +190,19 @@
dp->flags=0;
dp->refcount=1;
dp->master=NULL;
- dp->buffer=len?(unsigned char*)malloc(len+8):NULL;
- if(len) memset(dp->buffer+len,0,8);
+ dp->buffer=NULL;
+ if (len > 0 && (dp->buffer = (unsigned char *)malloc(len + 8)))
+ memset(dp->buffer + len, 0, 8);
+ else
+ dp->len = 0;
return dp;
}
inline static void resize_demux_packet(demux_packet_t* dp, int len)
{
- if(len)
+ if(len > 0)
{
dp->buffer=(unsigned char *)realloc(dp->buffer,len+8);
- memset(dp->buffer+len,0,8);
}
else
{
@@ -208,6 +210,10 @@
dp->buffer=NULL;
}
dp->len=len;
+ if (dp->buffer)
+ memset(dp->buffer + len, 0, 8);
+ else
+ dp->len = 0;
}
inline static demux_packet_t* clone_demux_packet(demux_packet_t* pack){