virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/avidec: dv does not support palettes

Browse Source 
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>
This commit is contained in:
Michael Niedermayer 2020-11-09 21:48:31 +01:00
parent 7540d60bf6
commit 1b373b41d9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/avidec.c
View File

@ -1446,6 +1446,7 @@ resync:
if (avi->stream_index >= 0) { if (avi->stream_index >= 0) {
AVStream *st = s->streams[avi->stream_index]; AVStream *st = s->streams[avi->stream_index];
AVIStream *ast = st->priv_data; AVIStream *ast = st->priv_data;
int dv_demux = CONFIG_DV_DEMUXER && avi->dv_demux;
int size, err; int size, err;
if (get_subtitle_pkt(s, st, pkt)) if (get_subtitle_pkt(s, st, pkt))
@ -1468,7 +1469,7 @@ resync:
return err; return err;
size = 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; uint8_t *pal;
pal = av_packet_new_side_data(pkt, pal = av_packet_new_side_data(pkt,
AV_PKT_DATA_PALETTE, AV_PKT_DATA_PALETTE,
@ -1482,7 +1483,7 @@ resync:
} }
} }
if (CONFIG_DV_DEMUXER && avi->dv_demux) { if (dv_demux) {
AVBufferRef *avbuf = pkt->buf; AVBufferRef *avbuf = pkt->buf;
size = avpriv_dv_produce_packet(avi->dv_demux, pkt, size = avpriv_dv_produce_packet(avi->dv_demux, pkt,
pkt->data, pkt->size, pkt->pos); pkt->data, pkt->size, pkt->pos);