[FFmpeg-cvslog] avformat/mov: Free temp buffer upon negative sample_size error.

Dale Curtis git at videolan.org
Wed May 20 20:48:52 EEST 2020


ffmpeg | branch: release/4.2 | Dale Curtis <dalecurtis at chromium.org> | Mon May 18 15:35:35 2020 -0700| [7c01f2770131f3e80d1e365f334c26b908178ad4] | committer: Michael Niedermayer

avformat/mov: Free temp buffer upon negative sample_size error.

2d8d554f15a7a27cfeca81467cc9341a86f784e2 added a new error condition
to mov_read_stsz() but forgot to free a temporary buffer when it
occurs.

Signed-off-by: Dale Curtis <dalecurtis at chromium.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit cd0771c38c06ef397466123c6c85521835f98bfd)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c01f2770131f3e80d1e365f334c26b908178ad4
---

 libavformat/mov.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index e57e7444a6..6b0e101af9 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2875,6 +2875,7 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     for (i = 0; i < entries && !pb->eof_reached; i++) {
         sc->sample_sizes[i] = get_bits_long(&gb, field_size);
         if (sc->sample_sizes[i] < 0) {
+            av_free(buf);
             av_log(c->fc, AV_LOG_ERROR, "Invalid sample size %d\n", sc->sample_sizes[i]);
             return AVERROR_INVALIDDATA;
         }



More information about the ffmpeg-cvslog mailing list