diff -up faad2/frontend/main.c.cve faad2/frontend/main.c
--- faad2/frontend/main.c.cve	2007-11-01 13:33:29.000000000 +0100
+++ faad2/frontend/main.c	2008-11-10 22:43:49.000000000 +0100
@@ -914,6 +914,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))
                 {