virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/binkaudio: reset ch_offset on errors

Browse Source 
Fixes: NULL pointer dereference
Fixes: 45955/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINKAUDIO_DCT_fuzzer-4842044192849920

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2022-03-28 20:27:20 +02:00
parent 7fbf1dd47e
commit 3a22bc03e6
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/binkaudio.c
View File

@@ -329,6 +329,7 @@ again:
avctx->codec->id == AV_CODEC_ID_BINKAUDIO_DCT, avctx->codec->id == AV_CODEC_ID_BINKAUDIO_DCT,
FFMIN(MAX_CHANNELS, s->channels - s->ch_offset), s->ch_offset)) { FFMIN(MAX_CHANNELS, s->channels - s->ch_offset), s->ch_offset)) {
av_log(avctx, AV_LOG_ERROR, "Incomplete packet\n"); av_log(avctx, AV_LOG_ERROR, "Incomplete packet\n");
s->ch_offset = 0;
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
s->ch_offset += MAX_CHANNELS; s->ch_offset += MAX_CHANNELS;
@@ -347,6 +348,7 @@ again:
return 0; return 0;
fail: fail:
s->ch_offset = 0;
av_packet_unref(s->pkt); av_packet_unref(s->pkt);
return ret; return ret;
} }