diff mbox series

[FFmpeg-devel] avcodec/binkaudio: reset ch_offset on errors

Message ID 20220328191227.25781-1-michael@niedermayer.cc
State Accepted
Commit 3a22bc03e6b1813a8388c39137150f322f9119f6
Headers show
Series [FFmpeg-devel] avcodec/binkaudio: reset ch_offset on errors | expand

Checks

Context Check Description
andriy/make_aarch64_jetson success Make finished
andriy/make_fate_aarch64_jetson success Make fate finished
andriy/make_armv7_RPi4 success Make finished
andriy/make_fate_armv7_RPi4 success Make fate finished

Commit Message

Michael Niedermayer March 28, 2022, 7:12 p.m. UTC 
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
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/binkaudio.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Paul B Mahol March 28, 2022, 7:24 p.m. UTC | #1 
lgtm
Michael Niedermayer March 29, 2022, 3:49 p.m. UTC | #2 
On Mon, Mar 28, 2022 at 09:24:05PM +0200, Paul B Mahol wrote:
> lgtm

will apply

thx

[...]
diff mbox series

Patch

diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
index 56b58b57c8..c4f3e743e2 100644
--- a/libavcodec/binkaudio.c
+++ b/libavcodec/binkaudio.c
@@ -329,6 +329,7 @@  again:
                      avctx->codec->id == AV_CODEC_ID_BINKAUDIO_DCT,
                      FFMIN(MAX_CHANNELS, s->channels - s->ch_offset), s->ch_offset)) {
         av_log(avctx, AV_LOG_ERROR, "Incomplete packet\n");
+        s->ch_offset = 0;
         return AVERROR_INVALIDDATA;
     }
     s->ch_offset += MAX_CHANNELS;
@@ -347,6 +348,7 @@  again:
 
     return 0;
 fail:
+    s->ch_offset = 0;
     av_packet_unref(s->pkt);
     return ret;
 }