OSDN Git Service

Fix handling of truncated files. Should fix random FATE breakages.
authorVitor Sessak <vitor1001@gmail.com>
Mon, 9 Aug 2010 07:17:01 +0000 (07:17 +0000)
committerVitor Sessak <vitor1001@gmail.com>
Mon, 9 Aug 2010 07:17:01 +0000 (07:17 +0000)
Originally committed as revision 24745 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/atrac3.c

index 3ac747c..8ccba0b 100644 (file)
@@ -827,8 +827,12 @@ static int atrac3_decode_frame(AVCodecContext *avctx,
     const uint8_t* databuf;
     int16_t* samples = data;
 
-    if (buf_size < avctx->block_align)
+    if (buf_size < avctx->block_align) {
+        av_log(avctx, AV_LOG_ERROR,
+               "Frame too small (%d bytes). Truncated file?\n", buf_size);
+        *data_size = 0;
         return buf_size;
+    }
 
     /* Check if we need to descramble and what buffer to pass on. */
     if (q->scrambled_stream) {