wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avformat/iff: fix EOF check

Browse source 
The check to return on EOF should not be inside a block that will not be entered after reaching EOF.
Should fix "libavcodec/bytestream.h:144:27: runtime error: applying zero offset to null pointer".

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2025-08-04 19:54:01 -03:00
parent c24b9b4b73
commit 8be539b022
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libavformat/iff.c
View file

@ -969,9 +969,6 @@ static int iff_read_packet(AVFormatContext *s,
uint32_t chunk_id, chunk_id2;
while (!avio_feof(pb)) {
if (avio_feof(pb))
return AVERROR_EOF;
orig_pos = avio_tell(pb);
chunk_id = avio_rl32(pb);
data_size = avio_rb32(pb);
@ -988,6 +985,9 @@ static int iff_read_packet(AVFormatContext *s,
avio_skip(pb, data_size);
}
}
if (pb->eof_reached)
return AVERROR_EOF;
ret = av_get_packet(pb, pkt, data_size);
pkt->stream_index = iff->video_stream_index;
pkt->pos = orig_pos;