ape: check that number of seektable entries is equal to number of frames
authorKostya Shishkov <kostya.shishkov@gmail.com>
Fri, 1 Apr 2011 07:26:38 +0000 (09:26 +0200)
committerAnton Khirnov <anton@khirnov.net>
Fri, 1 Apr 2011 07:34:44 +0000 (09:34 +0200)
fixes issue2480

Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavformat/ape.c

index 6c8880d..5aac00c 100644 (file)
@@ -250,6 +250,11 @@ static int ape_read_header(AVFormatContext * s, AVFormatParameters * ap)
         av_log(s, AV_LOG_ERROR, "Too many frames: %d\n", ape->totalframes);
         return -1;
     }
+    if (ape->seektablelength && (ape->seektablelength / sizeof(*ape->seektable)) < ape->totalframes) {
+        av_log(s, AV_LOG_ERROR, "Number of seek entries is less than number of frames: %d vs. %d\n",
+               ape->seektablelength / sizeof(*ape->seektable), ape->totalframes);
+        return AVERROR_INVALIDDATA;
+    }
     ape->frames       = av_malloc(ape->totalframes * sizeof(APEFrame));
     if(!ape->frames)
         return AVERROR(ENOMEM);