[FFmpeg-cvslog] avformat/mov: Remove pointless EOF checks
Andreas Rheinhardt
git at videolan.org
Thu Jul 29 00:17:53 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat Jul 24 06:14:13 2021 +0200| [65f9a8e4b817d4cca8cfdd4dcdaaf2817810df61] | committer: Andreas Rheinhardt
avformat/mov: Remove pointless EOF checks
9888ffb1ce5e0a17f711b01933d504c72ea29d3b added checks for EOF
in loops in the mov demuxer as a precaution against timeouts;
yet there is no I/O in the loop when parsing the STSZ atom
as the values are read from an already read buffer. So remove said
checks.
Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=65f9a8e4b817d4cca8cfdd4dcdaaf2817810df61
---
libavformat/mov.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index a847003dc2..e95d3d2a90 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2884,7 +2884,7 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom)
init_get_bits(&gb, buf, 8*num_bytes);
- for (i = 0; i < entries && !pb->eof_reached; i++) {
+ for (i = 0; i < entries; i++) {
sc->sample_sizes[i] = get_bits_long(&gb, field_size);
if (sc->sample_sizes[i] < 0) {
av_free(buf);
@@ -2898,11 +2898,6 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom)
av_free(buf);
- if (pb->eof_reached) {
- av_log(c->fc, AV_LOG_WARNING, "reached eof, corrupted STSZ atom\n");
- return AVERROR_EOF;
- }
-
return 0;
}
More information about the ffmpeg-cvslog
mailing list