[FFmpeg-cvslog] ffmpeg: Fix stts_data memory allocation

Xiaohan Wang git at videolan.org
Fri Mar 9 03:42:16 EET 2018


ffmpeg | branch: master | Xiaohan Wang <xhwang at chromium.org> | Tue Feb 13 14:45:14 2018 -0800| [3386be16d5131961f73c4227e9ddde4e3a5e39e3] | committer: Michael Niedermayer

ffmpeg: Fix stts_data memory allocation

In this loop, |i| is the "index". And the memory allocated should be at
least the current "count", which is |i + 1|.

BUG=801821

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 7002a82787..ab03a99dc3 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2859,7 +2859,7 @@ static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     for (i = 0; i < entries && !pb->eof_reached; i++) {
         int sample_duration;
         unsigned int sample_count;
-        unsigned min_entries = FFMIN(FFMAX(i, 1024 * 1024), entries);
+        unsigned int min_entries = FFMIN(FFMAX(i + 1, 1024 * 1024), entries);
         MOVStts *stts_data = av_fast_realloc(sc->stts_data, &alloc_size,
                                              min_entries * sizeof(*sc->stts_data));
         if (!stts_data) {



More information about the ffmpeg-cvslog mailing list