Re: [FFmpeg-devel] [PATCH 1/3] avcodec/apedec: Only clear the needed buffer space, instead of all

2019-10-29 Thread Michael Niedermayer
On Mon, Oct 28, 2019 at 07:22:31PM +0100, Paul B Mahol wrote:
> probably ok

will apply

thx

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

Elect your leaders based on what they did after the last election, not
based on what they say before an election.



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 1/3] avcodec/apedec: Only clear the needed buffer space, instead of all

2019-10-28 Thread Paul B Mahol
probably ok

On 10/28/19, Michael Niedermayer  wrote:
> Fixes: Timeout (15sec -> 0.4sec)
> Fixes:
> 18396/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5730080487112704
>
> Found-by: continuous fuzzing process
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer 
> ---
>  libavcodec/apedec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
> index 75c6a96437..2dd197a7f2 100644
> --- a/libavcodec/apedec.c
> +++ b/libavcodec/apedec.c
> @@ -1516,7 +1516,7 @@ static int ape_decode_frame(AVCodecContext *avctx,
> void *data,
>  av_fast_malloc(>decoded_buffer, >decoded_size,
> decoded_buffer_size);
>  if (!s->decoded_buffer)
>  return AVERROR(ENOMEM);
> -memset(s->decoded_buffer, 0, s->decoded_size);
> +memset(s->decoded_buffer, 0, decoded_buffer_size);
>  s->decoded[0] = s->decoded_buffer;
>  s->decoded[1] = s->decoded_buffer + FFALIGN(blockstodecode, 8);
>
> --
> 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 1/3] avcodec/apedec: Only clear the needed buffer space, instead of all

2019-10-28 Thread Michael Niedermayer
Fixes: Timeout (15sec -> 0.4sec)
Fixes: 
18396/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5730080487112704

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

diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 75c6a96437..2dd197a7f2 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -1516,7 +1516,7 @@ static int ape_decode_frame(AVCodecContext *avctx, void 
*data,
 av_fast_malloc(>decoded_buffer, >decoded_size, decoded_buffer_size);
 if (!s->decoded_buffer)
 return AVERROR(ENOMEM);
-memset(s->decoded_buffer, 0, s->decoded_size);
+memset(s->decoded_buffer, 0, decoded_buffer_size);
 s->decoded[0] = s->decoded_buffer;
 s->decoded[1] = s->decoded_buffer + FFALIGN(blockstodecode, 8);
 
-- 
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".