summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-09-23 12:37:29 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-09-23 12:37:29 +0000
commit55fb2bef1018ab5ed6380b1502cfe0c9c1af3870 (patch)
tree3a9efae24884ee04923ab2bf41a280bf4714d672 /media-libs/faad2/files/faad2-2.6.1-main-overflow.patch
parentSparc stable --- Bug #238437 --- it's been around over 6 weeks now. (diff)
downloadgentoo-2-55fb2bef1018ab5ed6380b1502cfe0c9c1af3870.tar.gz
gentoo-2-55fb2bef1018ab5ed6380b1502cfe0c9c1af3870.tar.bz2
gentoo-2-55fb2bef1018ab5ed6380b1502cfe0c9c1af3870.zip
Security bump w/ patch from bug 238445
(Portage version: 2.2_rc8/cvs/Linux 2.6.25.8 i686)
Diffstat (limited to 'media-libs/faad2/files/faad2-2.6.1-main-overflow.patch')
-rw-r--r--media-libs/faad2/files/faad2-2.6.1-main-overflow.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/media-libs/faad2/files/faad2-2.6.1-main-overflow.patch b/media-libs/faad2/files/faad2-2.6.1-main-overflow.patch
new file mode 100644
index 000000000000..4111bae7f6b1
--- /dev/null
+++ b/media-libs/faad2/files/faad2-2.6.1-main-overflow.patch
@@ -0,0 +1,13 @@
+Index: faad2/frontend/main.c
+===================================================================
+--- faad2.orig/frontend/main.c
++++ faad2/frontend/main.c
+@@ -916,6 +916,8 @@ int decodeMP4file(char *mp4file, char *s
+ 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))
+ {