diff mbox

[FFmpeg-devel,08/12] avcodec/atrac3: Check block_align

Message ID 20190925203858.27870-8-michael@niedermayer.cc
State Accepted
Commit 2acbbe262325187d87e8881c2984d203fb54207e
Headers show

Commit Message

Michael Niedermayer Sept. 25, 2019, 8:38 p.m. UTC 
Fixes: Infinite loop
Fixes: 17620/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ATRAC3_fuzzer-5086123012915200

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/atrac3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Paul B Mahol Sept. 26, 2019, 7:56 a.m. UTC | #1 
lgtm

On 9/25/19, Michael Niedermayer <michael@niedermayer.cc> wrote:
> Fixes: Infinite loop
> Fixes:
> 17620/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ATRAC3_fuzzer-5086123012915200
>
> Found-by: continuous fuzzing process
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/atrac3.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
> index 6cdcdf1964..dc19a3863e 100644
> --- a/libavcodec/atrac3.c
> +++ b/libavcodec/atrac3.c
> @@ -964,7 +964,7 @@ static av_cold int atrac3_decode_init(AVCodecContext
> *avctx)
>          return AVERROR_INVALIDDATA;
>      }
>
> -    if (avctx->block_align >= UINT_MAX / 2)
> +    if (avctx->block_align >= UINT_MAX / 2 || avctx->block_align <= 0)
>          return AVERROR(EINVAL);
>
>      q->decoded_bytes_buffer = av_mallocz(FFALIGN(avctx->block_align, 4) +
> --
> 2.23.0
>
> _______________________________________________
> 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".
Michael Niedermayer Sept. 26, 2019, 6:37 p.m. UTC | #2 
On Thu, Sep 26, 2019 at 09:56:51AM +0200, Paul B Mahol wrote:
> lgtm

will apply

thx

[...]
diff mbox

Patch

diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index 6cdcdf1964..dc19a3863e 100644
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -964,7 +964,7 @@  static av_cold int atrac3_decode_init(AVCodecContext *avctx)
         return AVERROR_INVALIDDATA;
     }
 
-    if (avctx->block_align >= UINT_MAX / 2)
+    if (avctx->block_align >= UINT_MAX / 2 || avctx->block_align <= 0)
         return AVERROR(EINVAL);
 
     q->decoded_bytes_buffer = av_mallocz(FFALIGN(avctx->block_align, 4) +