From: Michael Niedermayer <michael@niedermayer.cc>
Date: Fri, 24 Jul 2020 21:51:11 +0000 (+0200)
Subject: avformat/ape: Error out in case of EOF in the header
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a6df1fd5e96c012ba477a56b3858a310e243b921;p=ffmpeg

avformat/ape: Error out in case of EOF in the header

Fixes: OOM
Fixes: 24375/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6216862443241472

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/libavformat/ape.c b/libavformat/ape.c
index 39a584aa981..d92cb2867dd 100644
--- a/libavformat/ape.c
+++ b/libavformat/ape.c
@@ -253,7 +253,7 @@ static int ape_read_header(AVFormatContext * s)
             avio_skip(pb, ape->wavheaderlength);
     }
 
-    if(!ape->totalframes){
+    if(!ape->totalframes || pb->eof_reached){
         av_log(s, AV_LOG_ERROR, "No frames in the file!\n");
         return AVERROR(EINVAL);
     }
@@ -298,8 +298,11 @@ static int ape_read_header(AVFormatContext * s)
             for (i = 0; i < ape->totalframes && !pb->eof_reached; i++)
                 ape->bittable[i] = avio_r8(pb);
         }
-        if (pb->eof_reached)
-            av_log(s, AV_LOG_WARNING, "File truncated\n");
+        if (pb->eof_reached) {
+            av_log(s, AV_LOG_ERROR, "File truncated\n");
+            ret = AVERROR_INVALIDDATA;
+            goto fail;
+        }
     }
 
     ape->frames[0].pos     = ape->firstframe;