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

2019-09-26 Thread Michael Niedermayer
On Thu, Sep 26, 2019 at 09:56:51AM +0200, Paul B Mahol wrote:
> lgtm

will apply

thx

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

Dictatorship: All citizens are under surveillance, all their steps and
actions recorded, for the politicians to enforce control.
Democracy: All politicians are under surveillance, all their steps and
actions recorded, for the citizens to enforce control.


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".

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

2019-09-26 Thread Paul B Mahol
lgtm

On 9/25/19, Michael Niedermayer  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 
> ---
>  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-requ...@ffmpeg.org with subject "unsubscribe".
___
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 08/12] avcodec/atrac3: Check block_align

2019-09-25 Thread Michael Niedermayer
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 
---
 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-requ...@ffmpeg.org with subject "unsubscribe".