| Message ID | 20170725025127.19293-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 7140761481e4296723a592019a0244ebe6c1a8cf |
| Headers | show |
Le septidi 7 thermidor, an CCXXV, Michael Niedermayer a écrit : > Fixes: double free > Fixes: clusterfuzz-testcase-minimized-5080550145785856 > > Found-by: ClusterFuzz > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavformat/oggparsecelt.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) Looks ok. But could you tell how to reproduce here? I would like to understand what is happening a little better. Regards,
diff --git a/libavformat/oggparsecelt.c b/libavformat/oggparsecelt.c index 6d567f988a..9c438a096a 100644 --- a/libavformat/oggparsecelt.c +++ b/libavformat/oggparsecelt.c @@ -65,9 +65,14 @@ static int celt_header(AVFormatContext *s, int idx) st->codecpar->channels = nb_channels; if (sample_rate) avpriv_set_pts_info(st, 64, 1, sample_rate); - priv->extra_headers_left = 1 + extra_headers; - av_free(os->private); + + if (os->private) { + av_free(priv); + priv = os->private; + } os->private = priv; + priv->extra_headers_left = 1 + extra_headers; + AV_WL32(st->codecpar->extradata + 0, overlap); AV_WL32(st->codecpar->extradata + 4, version); return 1;
Fixes: double free Fixes: clusterfuzz-testcase-minimized-5080550145785856 Found-by: ClusterFuzz Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavformat/oggparsecelt.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)