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

* [FFmpeg-devel] [PATCH] avcodec/binkaudio: reset ch_offset on errors
@ 2022-03-28 19:12 Michael Niedermayer
  2022-03-28 19:24 ` Paul B Mahol
  0 siblings, 1 reply; 3+ messages in thread
From: Michael Niedermayer @ 2022-03-28 19:12 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

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(+)

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;
 }
-- 
2.17.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 3+ messages in thread