summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-06-14 03:23:27 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-07-02 10:15:09 +0200
commit3168d6ff3bf36e3428b2ef48618995bfbcf52ccc (patch)
tree2612b05bc13fbb9725acef93321dce1cc97a134f
parent7f46b16cb24e0f8ef069bcd8f0418c9197141cf7 (diff)
downloadffmpeg-3168d6ff3bf36e3428b2ef48618995bfbcf52ccc.tar.gz
avformat/srtdec: 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 c70409957c7332971f0e147729d769f6d2f95390) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-rw-r--r--libavformat/srtdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c
index 56bd0c43f6..67b245a123 100644
--- a/libavformat/srtdec.c
+++ b/libavformat/srtdec.c
@@ -207,6 +207,8 @@ static int srt_read_header(AVFormatContext *s)
ff_subtitles_queue_finalize(s, &srt->q);
end:
+ if (res < 0)
+ ff_subtitles_queue_clean(&srt->q);
av_bprint_finalize(&buf, NULL);
return res;
}