diff options
| author | Dale Curtis <dalecurtis@chromium.org> | 2017-11-20 12:07:57 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-11-21 03:33:53 +0100 |
| commit | 8e50cf48663116b9c836de6032cc33d8e884acf6 (patch) | |
| tree | 3b3707d819a84440924c25a3d139dc3a05b34b99 | |
| parent | 490b7a052ebb54eb2bc12128b83bd1b2dfca6243 (diff) | |
| download | ffmpeg-8e50cf48663116b9c836de6032cc33d8e884acf6.tar.gz | |
Close ogg stream upon error when using AV_EF_EXPLODE.
Without this there can be multiple memory leaks for unrecognized
ogg streams.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit bce8fc0754c4b31f574a4372c6d7996ed29f7c2a)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/oggdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index b1caf98f29..4c68b3d4a8 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -685,8 +685,10 @@ static int ogg_read_header(AVFormatContext *s) "Headers mismatch for stream %d: " "expected %d received %d.\n", i, os->codec->nb_header, os->nb_header); - if (s->error_recognition & AV_EF_EXPLODE) + if (s->error_recognition & AV_EF_EXPLODE) { + ogg_read_close(s); return AVERROR_INVALIDDATA; + } } if (os->start_granule != OGG_NOGRANULE_VALUE) os->lastpts = s->streams[i]->start_time = |