diff -Naur MPlayer-1.0pre7/ChangeLog MPlayer-1.0pre7try2/ChangeLog --- MPlayer-1.0pre7/ChangeLog 2005-04-16 20:40:26.000000000 +0000 +++ MPlayer-1.0pre7try2/ChangeLog 2005-08-26 22:13:47.000000000 +0000 @@ -1,5 +1,11 @@ MPlayer (1.0) + pre7try2: August 26, 2005 + + Security: + * heap overflow in PCM audio decoder fixed + + pre7: "PatentCounter" April 16, 2005 Security: diff -Naur MPlayer-1.0pre7/libmpcodecs/ad_pcm.c MPlayer-1.0pre7try2/libmpcodecs/ad_pcm.c --- MPlayer-1.0pre7/libmpcodecs/ad_pcm.c 2005-02-26 23:02:09.000000000 +0000 +++ MPlayer-1.0pre7try2/libmpcodecs/ad_pcm.c 2005-08-26 22:11:02.000000000 +0000 @@ -96,8 +96,8 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen) { - int len=sh_audio->channels*sh_audio->samplesize-1; - len=(minlen+len)&(~len); // sample align + unsigned len = sh_audio->channels*sh_audio->samplesize; + len = maxlen - maxlen % len; // sample align len=demux_read_data(sh_audio->ds,buf,len); return len; } diff -Naur MPlayer-1.0pre7/version.sh MPlayer-1.0pre7try2/version.sh --- MPlayer-1.0pre7/version.sh 2005-04-16 20:41:14.000000000 +0000 +++ MPlayer-1.0pre7try2/version.sh 2005-08-27 00:22:03.000000000 +0000 @@ -1,2 +1,2 @@ #!/bin/sh -echo "#define VERSION \"1.0pre7-$1\"" > version.h +echo "#define VERSION \"1.0pre7try2-$1\"" > version.h