diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-06-14 03:19:32 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-07-03 00:02:13 +0200 |
| commit | 036c52f2d6b9f42e171b186cf2a038b8684d3f71 (patch) | |
| tree | 4915e7308afbceb3f536c332563a7575ee55d66f | |
| parent | a7309ecc325119623ee2807da194111da0eda2fd (diff) | |
| download | ffmpeg-036c52f2d6b9f42e171b186cf2a038b8684d3f71.tar.gz | |
avformat/mpl2dec: Fix memleak upon read header failure
The already parsed subtitles (contained in an FFDemuxSubtitlesQueue)
would leak if an error happened upon reading a subsequent subtitle.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit 331799747e7e995710f5dfc4d413cda35eb01289)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavformat/mpl2dec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mpl2dec.c b/libavformat/mpl2dec.c index 0665c4c635..c25f85e0e3 100644 --- a/libavformat/mpl2dec.c +++ b/libavformat/mpl2dec.c @@ -111,8 +111,10 @@ static int mpl2_read_header(AVFormatContext *s) AVPacket *sub; sub = ff_subtitles_queue_insert(&mpl2->q, p, strlen(p), 0); - if (!sub) + if (!sub) { + ff_subtitles_queue_clean(&mpl2->q); return AVERROR(ENOMEM); + } sub->pos = pos; sub->pts = pts_start; sub->duration = duration; |