RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/usmdec: do not return 0 when no packet was produced 

Fixes: Assertion pkt->stream_index < (unsigned)s->nb_streams && "Invalid stream index.\n" failed at libavformat/demux.c:617
Fixes: 62498/clusterfuzz-testcase-minimized-ffmpeg_dem_USM_fuzzer-4734740995112960

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2023-10-05 14:38:08 +02:00
parent cd66606a8f
commit fff875a7f4
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/usmdec.c
View File

@ -361,7 +361,7 @@ static int64_t parse_chunk(AVFormatContext *s, AVIOContext *pb,
ret = avio_skip(pb, FFMAX(0, chunk_size - (ret - chunk_start))); ret = avio_skip(pb, FFMAX(0, chunk_size - (ret - chunk_start)));
if (ret < 0) if (ret < 0)
return ret; return ret;
return 0; return FFERROR_REDO;
} }
static int usm_read_packet(AVFormatContext *s, AVPacket *pkt) static int usm_read_packet(AVFormatContext *s, AVPacket *pkt)