diff mbox

[FFmpeg-devel] avcodec/mpeg4videodec: Clear interlaced_dct for studio profile

Message ID 20190215005709.15250-1-michael@niedermayer.cc
State Accepted
Commit 1f686d023b95219db933394a7704ad9aa5f01cbb
Headers show

Commit Message

Michael Niedermayer Feb. 15, 2019, 12:57 a.m. UTC
Fixes: Out of array access
Fixes: 13090/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-5408668986638336

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

Comments

Kieran Kunhya Feb. 15, 2019, 9:57 p.m. UTC | #1
ok

On Fri, 15 Feb 2019 at 00:58 Michael Niedermayer <michael@niedermayer.cc>
wrote:

> Fixes: Out of array access
> Fixes:
> 13090/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-5408668986638336
>
> Found-by: continuous fuzzing process
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by
> <https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by>:
> Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/mpeg4videodec.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
> index f44ee76bd4..ecd028a87c 100644
> --- a/libavcodec/mpeg4videodec.c
> +++ b/libavcodec/mpeg4videodec.c
> @@ -3057,6 +3057,7 @@ static int decode_studio_vop_header(Mpeg4DecContext
> *ctx, GetBitContext *gb)
>          return 0;
>
>      s->partitioned_frame = 0;
> +    s->interlaced_dct = 0;
>      s->decode_mb = mpeg4_decode_studio_mb;
>
>      decode_smpte_tc(ctx, gb);
> --
> 2.20.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
Michael Niedermayer Feb. 16, 2019, 6:58 p.m. UTC | #2
On Fri, Feb 15, 2019 at 09:57:18PM +0000, Kieran Kunhya wrote:
> ok

will apply

thx

[...]
diff mbox

Patch

diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index f44ee76bd4..ecd028a87c 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -3057,6 +3057,7 @@  static int decode_studio_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb)
         return 0;
 
     s->partitioned_frame = 0;
+    s->interlaced_dct = 0;
     s->decode_mb = mpeg4_decode_studio_mb;
 
     decode_smpte_tc(ctx, gb);