diff options
| -rw-r--r-- | audio/faad2/README (renamed from multimedia/faad2/README) | 0 | ||||
| -rw-r--r-- | audio/faad2/faad2.SlackBuild (renamed from multimedia/faad2/faad2.SlackBuild) | 7 | ||||
| -rw-r--r-- | audio/faad2/faad2.info (renamed from multimedia/faad2/faad2.info) | 4 | ||||
| -rw-r--r-- | audio/faad2/main_overflow.diff | 11 | ||||
| -rw-r--r-- | audio/faad2/slack-desc (renamed from multimedia/faad2/slack-desc) | 0 |
5 files changed, 19 insertions, 3 deletions
diff --git a/multimedia/faad2/README b/audio/faad2/README index afe448b9c30c0..afe448b9c30c0 100644 --- a/multimedia/faad2/README +++ b/audio/faad2/README diff --git a/multimedia/faad2/faad2.SlackBuild b/audio/faad2/faad2.SlackBuild index 8b32b70176606..18f98274e5ef6 100644 --- a/multimedia/faad2/faad2.SlackBuild +++ b/audio/faad2/faad2.SlackBuild @@ -25,8 +25,9 @@ PRGNAM=faad2 VERSION=2.6.1 ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -50,6 +51,10 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R a-s,u+rw,go+r-w . +# Security patch - possible heap overflow when reading from a +# buffer returned by the decoder library. +patch -p1 < $CWD/main_overflow.diff + autoreconf -vif CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/multimedia/faad2/faad2.info b/audio/faad2/faad2.info index 6bb0287181384..5ed0bea44c7ba 100644 --- a/multimedia/faad2/faad2.info +++ b/audio/faad2/faad2.info @@ -3,6 +3,6 @@ VERSION="2.6.1" HOMEPAGE="http://www.audiocoding.com/" DOWNLOAD="http://downloads.sourceforge.net/faac/faad2-2.6.1.tar.gz" MD5SUM="74e92df40c270f216a8305fc87603c8a" -MAINTAINER="Niklas "Nille" Åkerström" -EMAIL="nille_kungen[AT]hotmail.com" +MAINTAINER="Nille Åkerström" +EMAIL="nille.kungen[AT]gmail.com" APPROVED="rworkman" diff --git a/audio/faad2/main_overflow.diff b/audio/faad2/main_overflow.diff new file mode 100644 index 0000000000000..b501cd004840f --- /dev/null +++ b/audio/faad2/main_overflow.diff @@ -0,0 +1,11 @@ +--- faad2/frontend/main.c.orig 2007-11-01 13:33:29.000000000 +0100 ++++ faad2/frontend/main.c 2008-10-02 00:13:21.000000000 +0200 +@@ -914,6 +914,8 @@ + sample_count = frameInfo.samples; + } else { + sample_count = (unsigned int)(dur * frameInfo.channels); ++ if (sample_count > frameInfo.samples) ++ sample_count = frameInfo.samples; + + if (!useAacLength && !initial && (sampleId < numSamples/2) && (sample_count != frameInfo.samples)) + { diff --git a/multimedia/faad2/slack-desc b/audio/faad2/slack-desc index 94ac88a26f05a..94ac88a26f05a 100644 --- a/multimedia/faad2/slack-desc +++ b/audio/faad2/slack-desc |