You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-10 06:10:52 +02:00
avformat/mov: fix eof check in mov_read_iinf()
This fix ensures that the loop stops early on EOF. The issue occurs because mov_read_infe() performs a version check and skips unsupported versions. The problem is that seeking within the stream clears the EOF flag, causing avio_feof() to not function as expected. This is resolved by moving the EOF check after reading the size and type, ensuring the EOF flag is set when necessary. Signed-off-by: Kacper Michajłow <kasper93@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
committed by
Michael Niedermayer
parent
4d9cdf82ee
commit
c17774a9ae
@@ -8868,12 +8868,12 @@ static int mov_read_iinf(MOVContext *c, AVIOContext *pb, MOVAtom atom)
|
|||||||
for (i = 0; i < entry_count; i++) {
|
for (i = 0; i < entry_count; i++) {
|
||||||
MOVAtom infe;
|
MOVAtom infe;
|
||||||
|
|
||||||
|
infe.size = avio_rb32(pb) - 8;
|
||||||
|
infe.type = avio_rl32(pb);
|
||||||
if (avio_feof(pb)) {
|
if (avio_feof(pb)) {
|
||||||
ret = AVERROR_INVALIDDATA;
|
ret = AVERROR_INVALIDDATA;
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
infe.size = avio_rb32(pb) - 8;
|
|
||||||
infe.type = avio_rl32(pb);
|
|
||||||
ret = mov_read_infe(c, pb, infe, i);
|
ret = mov_read_infe(c, pb, infe, i);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
Reference in New Issue
Block a user