diff mbox series

[FFmpeg-devel,2/3] avformat/mov: Do not deallocate heif_item in a input dependant way

Message ID 20240322230818.18997-2-michael@niedermayer.cc
State Accepted
Commit 0a114d7318ab0e2499531bf496392d1bee4130fc
Headers show
Series [FFmpeg-devel,1/3] avformat/cafdec: sanity check channels and bps | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Michael Niedermayer March 22, 2024, 11:08 p.m. UTC 
Fixes: out of array access
Fixes: 67070/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5685384082161664

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

Comments

James Almer March 26, 2024, 1:22 a.m. UTC | #1 
On 3/22/2024 8:08 PM, Michael Niedermayer wrote:
> Fixes: out of array access
> Fixes: 67070/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5685384082161664
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>   libavformat/mov.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libavformat/mov.c b/libavformat/mov.c
> index f954b924a0..a87ce5cefe 100644
> --- a/libavformat/mov.c
> +++ b/libavformat/mov.c
> @@ -8077,7 +8077,7 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom)
>       }
>       item_count = (version < 2) ? avio_rb16(pb) : avio_rb32(pb);
>   
> -    heif_item = av_realloc_array(c->heif_item, item_count, sizeof(*c->heif_item));
> +    heif_item = av_realloc_array(c->heif_item, FFMAX(item_count, c->nb_heif_item), sizeof(*c->heif_item));
>       if (!heif_item)
>           return AVERROR(ENOMEM);
>       c->heif_item = heif_item;
> @@ -8202,7 +8202,7 @@ static int mov_read_iinf(MOVContext *c, AVIOContext *pb, MOVAtom atom)
>       avio_rb24(pb);  // flags.
>       entry_count = version ? avio_rb32(pb) : avio_rb16(pb);
>   
> -    heif_item = av_realloc_array(c->heif_item, entry_count, sizeof(*c->heif_item));
> +    heif_item = av_realloc_array(c->heif_item, FFMAX(entry_count, c->nb_heif_item), sizeof(*c->heif_item));
>       if (!heif_item)
>           return AVERROR(ENOMEM);
>       c->heif_item = heif_item;

LGTM.
Michael Niedermayer March 26, 2024, 7:29 p.m. UTC | #2 
On Mon, Mar 25, 2024 at 10:22:19PM -0300, James Almer wrote:
> On 3/22/2024 8:08 PM, Michael Niedermayer wrote:
> > Fixes: out of array access
> > Fixes: 67070/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5685384082161664
> > 
> > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >   libavformat/mov.c | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/libavformat/mov.c b/libavformat/mov.c
> > index f954b924a0..a87ce5cefe 100644
> > --- a/libavformat/mov.c
> > +++ b/libavformat/mov.c
> > @@ -8077,7 +8077,7 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom)
> >       }
> >       item_count = (version < 2) ? avio_rb16(pb) : avio_rb32(pb);
> > -    heif_item = av_realloc_array(c->heif_item, item_count, sizeof(*c->heif_item));
> > +    heif_item = av_realloc_array(c->heif_item, FFMAX(item_count, c->nb_heif_item), sizeof(*c->heif_item));
> >       if (!heif_item)
> >           return AVERROR(ENOMEM);
> >       c->heif_item = heif_item;
> > @@ -8202,7 +8202,7 @@ static int mov_read_iinf(MOVContext *c, AVIOContext *pb, MOVAtom atom)
> >       avio_rb24(pb);  // flags.
> >       entry_count = version ? avio_rb32(pb) : avio_rb16(pb);
> > -    heif_item = av_realloc_array(c->heif_item, entry_count, sizeof(*c->heif_item));
> > +    heif_item = av_realloc_array(c->heif_item, FFMAX(entry_count, c->nb_heif_item), sizeof(*c->heif_item));
> >       if (!heif_item)
> >           return AVERROR(ENOMEM);
> >       c->heif_item = heif_item;
> 
> LGTM.

will apply

thx

[...]
diff mbox series

Patch

diff --git a/libavformat/mov.c b/libavformat/mov.c
index f954b924a0..a87ce5cefe 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -8077,7 +8077,7 @@  static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     }
     item_count = (version < 2) ? avio_rb16(pb) : avio_rb32(pb);
 
-    heif_item = av_realloc_array(c->heif_item, item_count, sizeof(*c->heif_item));
+    heif_item = av_realloc_array(c->heif_item, FFMAX(item_count, c->nb_heif_item), sizeof(*c->heif_item));
     if (!heif_item)
         return AVERROR(ENOMEM);
     c->heif_item = heif_item;
@@ -8202,7 +8202,7 @@  static int mov_read_iinf(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     avio_rb24(pb);  // flags.
     entry_count = version ? avio_rb32(pb) : avio_rb16(pb);
 
-    heif_item = av_realloc_array(c->heif_item, entry_count, sizeof(*c->heif_item));
+    heif_item = av_realloc_array(c->heif_item, FFMAX(entry_count, c->nb_heif_item), sizeof(*c->heif_item));
     if (!heif_item)
         return AVERROR(ENOMEM);
     c->heif_item = heif_item;