[FFmpeg-cvslog] pmpdec: check for EOF while reading index.

Reimar Döffinger git at videolan.org
Sun Feb 24 00:02:26 CET 2013


ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Sat Feb 23 19:44:46 2013 +0100| [50a37f9202a86c3dcdd7076ecf8f0d446c542b25] | committer: Reimar Döffinger

pmpdec: check for EOF while reading index.

Otherwise even a tiny file can trigger a huge memory allocation.

Related to ticket #2298.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=50a37f9202a86c3dcdd7076ecf8f0d446c542b25
---

 libavformat/pmpdec.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavformat/pmpdec.c b/libavformat/pmpdec.c
index 2ea37ef..3133707 100644
--- a/libavformat/pmpdec.c
+++ b/libavformat/pmpdec.c
@@ -105,6 +105,10 @@ static int pmp_header(AVFormatContext *s)
     for (i = 0; i < index_cnt; i++) {
         int size = avio_rl32(pb);
         int flags = size & 1 ? AVINDEX_KEYFRAME : 0;
+        if (url_feof(pb)) {
+            av_log(s, AV_LOG_FATAL, "Encountered EOF while reading index.\n");
+            return AVERROR_INVALIDDATA;
+        }
         size >>= 1;
         av_add_index_entry(vst, pos, i, size, 0, flags);
         pos += size;



More information about the ffmpeg-cvslog mailing list