Message ID | CAB0OVGoR3A9bFVqrB2F48z77XfnQK-oT7fvKmDnAPxJD8Utrnw@mail.gmail.com |
---|---|
State | Accepted |
Headers | show |
On 12/23/18, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote: > Hi! > > Attached patch can avoid a crash in avcodec_parameters_from_context() > if extradata_size was increased after allocation. > > Please comment, Carl Eugen > OK
2018-12-23 9:54 GMT+01:00, Paul B Mahol <onemda@gmail.com>: > On 12/23/18, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote: >> Hi! >> >> Attached patch can avoid a crash in avcodec_parameters_from_context() >> if extradata_size was increased after allocation. >> >> Please comment, Carl Eugen >> > > OK Patch applied. Thank you, Carl Eugen
From 37ca1caa949902ec209c7c779b2c5b0ca3d3a3e6 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos <ceffmpeg@gmail.com> Date: Sun, 23 Dec 2018 00:34:57 +0100 Subject: [PATCH] lavf/vividas: Do not increase extradata_size after allocation. Avoids a crash in avcodec_parameters_from_context(). --- libavformat/vividas.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/vividas.c b/libavformat/vividas.c index e199b05..00a1a0f 100644 --- a/libavformat/vividas.c +++ b/libavformat/vividas.c @@ -392,7 +392,8 @@ static void track_header(VividasDemuxContext *viv, AVFormatContext *s, uint8_t offset += data_len[j]; } - st->codecpar->extradata_size = offset; + if (offset < st->codecpar->extradata_size) + st->codecpar->extradata_size = offset; } } -- 1.7.10.4