diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-11-09 21:48:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-17 21:34:53 +0200 |
| commit | b222d99f4d9896c4f0da8b433908c6dd2c9b829e (patch) | |
| tree | e25a83fe1ef51eb4cff915d275c653b7c7713c32 | |
| parent | 8691447d5db897e5d03714238a51ba1d115d8938 (diff) | |
| download | ffmpeg-b222d99f4d9896c4f0da8b433908c6dd2c9b829e.tar.gz | |
avformat/avidec: dv does not support palettes
Fixes: memleak
Fixes: 26937/clusterfuzz-testcase-minimized-ffmpeg_dem_AVI_fuzzer-5763003338981376
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 1b373b41d940e3058cdfb3d17703e23ed665353c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/avidec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index fed74df171..38f537af1b 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1395,6 +1395,7 @@ resync: if (avi->stream_index >= 0) { AVStream *st = s->streams[avi->stream_index]; AVIStream *ast = st->priv_data; + int dv_demux = CONFIG_DV_DEMUXER && avi->dv_demux; int size, err; if (get_subtitle_pkt(s, st, pkt)) @@ -1417,7 +1418,7 @@ resync: return err; size = err; - if (ast->has_pal && pkt->size < (unsigned)INT_MAX / 2) { + if (ast->has_pal && pkt->size < (unsigned)INT_MAX / 2 && !dv_demux) { uint8_t *pal; pal = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE, @@ -1431,7 +1432,7 @@ resync: } } - if (CONFIG_DV_DEMUXER && avi->dv_demux) { + if (dv_demux) { AVBufferRef *avbuf = pkt->buf; #if FF_API_DESTRUCT_PACKET FF_DISABLE_DEPRECATION_WARNINGS |