Magellan Linux

Contents of /trunk/mplayer/patches/mplayer-1.0_pre7-ad-pcm-security-fix.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 153 - (show annotations) (download)
Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
File size: 1359 byte(s)
-import

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