Re: [FFmpeg-devel] Fix stts_data memory allocation
On Tue, Mar 06, 2018 at 02:24:51PM -0800, Xiaohan Wang (王消寒) wrote: > kingly ping! will apply thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB It is dangerous to be right in matters on which the established authorities are wrong. -- Voltaire signature.asc Description: PGP signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] Fix stts_data memory allocation
kingly ping! On Tue, Feb 13, 2018 at 4:08 PM, Xiaohan Wang (王消寒)wrote: > "unsigned" is perfectly fine. Just trying to be consistent with the line > above. > > On Tue, Feb 13, 2018 at 4:06 PM, Carl Eugen Hoyos > wrote: > >> 2018-02-13 23:48 GMT+01:00 Xiaohan Wang (王消寒) : >> >> Thank you for the fix! >> (What's wrong with "unsigned"?) >> >> Carl Eugen >> ___ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> > > ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] Fix stts_data memory allocation
"unsigned" is perfectly fine. Just trying to be consistent with the line above. On Tue, Feb 13, 2018 at 4:06 PM, Carl Eugen Hoyoswrote: > 2018-02-13 23:48 GMT+01:00 Xiaohan Wang (王消寒) : > > Thank you for the fix! > (What's wrong with "unsigned"?) > > Carl Eugen > ___ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] Fix stts_data memory allocation
2018-02-13 23:48 GMT+01:00 Xiaohan Wang (王消寒): Thank you for the fix! (What's wrong with "unsigned"?) Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] Fix stts_data memory allocation
From 241d5e45eb8750521d07d07aa55ea637359ab55d Mon Sep 17 00:00:00 2001 From: Xiaohan WangDate: Tue, 13 Feb 2018 14:45:14 -0800 Subject: [PATCH] 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 --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 5adba52e08..1e02ffb445 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2882,7 +2882,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, _size, min_entries * sizeof(*sc->stts_data)); if (!stts_data) { -- 2.16.1.291.g4437f3f132-goog ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel