Re: [FFmpeg-devel] [PATCH 1/5] avcodec/vmixdec: Check for end of input in decode_dcac()

2023-09-07 Thread Michael Niedermayer 
On Sun, Jul 23, 2023 at 08:02:59PM +0200, Michael Niedermayer wrote:
> Fixes: Timeout
> Fixes: 
> 59952/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VMIX_fuzzer-6718213736759296
> 
> Found-by: continuous fuzzing process 
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer 
> ---
>  libavcodec/vmixdec.c | 4 
>  1 file changed, 4 insertions(+)

will apply 1/5 and 2/5

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Does the universe only have a finite lifespan? No, its going to go on
forever, its just that you wont like living in it. -- Hiranya Peiri


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

[FFmpeg-devel] [PATCH 1/5] avcodec/vmixdec: Check for end of input in decode_dcac()

2023-07-23 Thread Michael Niedermayer 
Fixes: Timeout
Fixes: 
59952/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VMIX_fuzzer-6718213736759296

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
---
 libavcodec/vmixdec.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/vmixdec.c b/libavcodec/vmixdec.c
index b77c90929a..4cc5963e25 100644
--- a/libavcodec/vmixdec.c
+++ b/libavcodec/vmixdec.c
@@ -115,6 +115,8 @@ static int decode_dcac(AVCodecContext *avctx,
 if (dc_run > 0) {
 dc_run--;
 } else {
+if (get_bits_left(dc_gb) < 1)
+return AVERROR_INVALIDDATA;
 dc_v = get_se_golomb_vmix(dc_gb);
 dc += (unsigned)dc_v;
 if (!dc_v)
@@ -127,6 +129,8 @@ static int decode_dcac(AVCodecContext *avctx,
 continue;
 }
 
+if (get_bits_left(ac_gb) < 1)
+return AVERROR_INVALIDDATA;
 ac_v = get_se_golomb_vmix(ac_gb);
 i = scan[n];
 block[i] = ((unsigned)ac_v * factors[i]) >> 4;
-- 
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-requ...@ffmpeg.org with subject "unsubscribe".